injitools / cms-Inji

system/modules/Money/objects/Sums.php

Indentation +28 added lines, -28 removed lines

@@ -13,65 +13,65 @@
 
 class Sums extends \Object {
 
-  public $sums = [];
+    public $sums = [];
 
-  public function __construct($sums) {
+    public function __construct($sums) {
     $this->sums = $sums;
-  }
+    }
 
-  function plus(Sums $sums) {
+    function plus(Sums $sums) {
     $newSums = $this->sums;
     foreach ($sums->sums as $currency_id => $sum) {
-      $newSums[$currency_id] = isset($newSums[$currency_id]) ? $newSums[$currency_id] + $sum : $sum;
+        $newSums[$currency_id] = isset($newSums[$currency_id]) ? $newSums[$currency_id] + $sum : $sum;
     }
     return new Sums($newSums);
-  }
+    }
 
-  function minus(Sums $sums) {
+    function minus(Sums $sums) {
     $newSums = $this->sums;
     foreach ($sums->sums as $currency_id => $sum) {
-      $newSums[$currency_id] = isset($newSums[$currency_id]) ? $newSums[$currency_id] - $sum : -$sum;
+        $newSums[$currency_id] = isset($newSums[$currency_id]) ? $newSums[$currency_id] - $sum : -$sum;
     }
     return new Sums($newSums);
-  }
+    }
 
 //Equal, Less and Greater
-  public function greater(Sums $sums) {
+    public function greater(Sums $sums) {
     if (count($this->sums) == count($sums->sums) && isset($sums->sums[key($this->sums)])) {
-      return current($this->sums) > current($sums->sums);
+        return current($this->sums) > current($sums->sums);
+    }
     }
-  }
 
-  public function equal(Sums $sums) {
+    public function equal(Sums $sums) {
     if (count($this->sums) == count($sums->sums) && isset($sums->sums[key($this->sums)])) {
-      return current($this->sums) == current($sums->sums);
+        return current($this->sums) == current($sums->sums);
+    }
     }
-  }
 
-  function __toString() {
+    function __toString() {
     $string = '';
     $first = true;
     foreach ($this->sums as $currency_id => $sum) {
-      if ($first) {
+        if ($first) {
         $first = false;
-      } else {
+        } else {
         $string.= '<br />';
-      }
-      $string.= '<span style="white-space:nowrap;">';
-      $string.= number_format($sum, 2, '.', ' ');
-      if (\App::$cur->money) {
+        }
+        $string.= '<span style="white-space:nowrap;">';
+        $string.= number_format($sum, 2, '.', ' ');
+        if (\App::$cur->money) {
         $currency = \Money\Currency::get($currency_id);
         if ($currency) {
-          $string.= ' ' . $currency->acronym();
+            $string.= ' ' . $currency->acronym();
         } else {
-          $string.= ' руб.';
+            $string.= ' руб.';
         }
-      } else {
+        } else {
         $string.= ' руб.';
-      }
-      $string.= '</span>';
+        }
+        $string.= '</span>';
     }
     return $string;
-  }
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -55,21 +55,21 @@
       if ($first) {
         $first = false;
       } else {
-        $string.= '<br />';
+        $string .= '<br />';
       }
-      $string.= '<span style="white-space:nowrap;">';
-      $string.= number_format($sum, 2, '.', ' ');
+      $string .= '<span style="white-space:nowrap;">';
+      $string .= number_format($sum, 2, '.', ' ');
       if (\App::$cur->money) {
         $currency = \Money\Currency::get($currency_id);
         if ($currency) {
-          $string.= ' ' . $currency->acronym();
+          $string .= ' '.$currency->acronym();
         } else {
-          $string.= ' руб.';
+          $string .= ' руб.';
         }
       } else {
-        $string.= ' руб.';
+        $string .= ' руб.';
       }
-      $string.= '</span>';
+      $string .= '</span>';
     }
     return $string;
   }

system/modules/Ecommerce/appControllers/CartController.php

Indentation +106 added lines, -106 removed lines

@@ -10,145 +10,145 @@ 
  */
 class CartController extends Controller {
 
-  public function indexAction() {
+    public function indexAction() {
     $cart = '';
     $deliverys = \Ecommerce\Delivery::getList(['order' => ['weight', 'ASC']]);
     $payTypes = \Ecommerce\PayType::getList(['order' => ['weight', 'ASC']]);
     if (!empty($_SESSION['cart']['cart_id'])) {
-      $cart = Ecommerce\Cart::get($_SESSION['cart']['cart_id']);
-      if (!empty($_POST)) {
+        $cart = Ecommerce\Cart::get($_SESSION['cart']['cart_id']);
+        if (!empty($_POST)) {
         $error = false;
         if (!Users\User::$cur->id) {
-          $user_id = $this->Users->registration($_POST, true);
-          if (!$user_id) {
+            $user_id = $this->Users->registration($_POST, true);
+            if (!$user_id) {
             $error = true;
-          } else {
+            } else {
             $user = Users\User::get($user_id);
-          }
+            }
         } else {
-          $user = Users\User::$cur;
+            $user = Users\User::$cur;
         }
         $ids = [];
         if (!empty($_POST['cartItems'])) {
-          foreach ($_POST['cartItems'] as $cartItemId => $cartItemCont) {
+            foreach ($_POST['cartItems'] as $cartItemId => $cartItemCont) {
             $cartItem = \Ecommerce\Cart\Item::get((int) $cartItemId);
             if (!$cartItem) {
-              continue;
+                continue;
             }
             if ($cartItem->cart_id != $cart->id) {
-              continue;
+                continue;
             }
             $count = (float) $cartItemCont;
             if ($count < 0.001) {
-              $count = 1;
+                $count = 1;
             }
             $cartItem->count = $count;
             $cartItem->save();
             $ids[] = $cartItemId;
-          }
+            }
         }
         foreach ($cart->cartItems as $cartItem) {
-          if (!in_array($cartItem->id, $ids)) {
+            if (!in_array($cartItem->id, $ids)) {
             $cartItem->delete();
-          }
+            }
         }
         $cart = Ecommerce\Cart::get($cart->id);
         if (!$cart->cartItems) {
-          Tools::redirect('/ecommerce', 'Ваша корзина пуста');
+            Tools::redirect('/ecommerce', 'Ваша корзина пуста');
         }
         if (empty($this->module->config['sell_over_warehouse'])) {
-          foreach ($cart->cartItems as $cartitem) {
+            foreach ($cart->cartItems as $cartitem) {
             $warecount = $cartitem->price->offer->warehouseCount($cart->id);
             if ($cartitem->count > $warecount) {
-              $error = true;
-              Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+                $error = true;
+                Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+            }
             }
-          }
         }
         if ($deliverys && empty($deliverys[$_POST['delivery']])) {
-          $error = 1;
-          Msg::add('Выберите способ доставки');
+            $error = 1;
+            Msg::add('Выберите способ доставки');
         } elseif ($deliverys && !empty($deliverys[$_POST['delivery']])) {
-          $cart->delivery_id = $_POST['delivery'];
-          foreach ($deliverys[$cart->delivery_id]->fields as $field) {
+            $cart->delivery_id = $_POST['delivery'];
+            foreach ($deliverys[$cart->delivery_id]->fields as $field) {
             if (empty($_POST['deliveryFields'][$field->id]) && $field->required) {
-              $error = 1;
-              Msg::add('Вы не указали: ' . $field->name);
+                $error = 1;
+                Msg::add('Вы не указали: ' . $field->name);
+            }
             }
-          }
         }
         if ($payTypes && (empty($_POST['payType']) || empty($payTypes[$_POST['payType']]))) {
-          $error = 1;
-          Msg::add('Выберите способ оплаты');
+            $error = 1;
+            Msg::add('Выберите способ оплаты');
         } elseif ($payTypes && !empty($payTypes[$_POST['payType']])) {
-          $payType = $payTypes[$_POST['payType']];
-          $cart->paytype_id = $payType->id;
+            $payType = $payTypes[$_POST['payType']];
+            $cart->paytype_id = $payType->id;
         } else {
-          $payType = null;
+            $payType = null;
         }
         foreach (\Ecommerce\UserAdds\Field::getList() as $field) {
-          if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
+            if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
             $error = 1;
             Msg::add('Вы не указали: ' . $field->name);
-          }
+            }
         }
         if (!empty($_POST['discounts']['card_item_id'])) {
-          $userCard = \Ecommerce\Card\Item::get((int) $_POST['discounts']['card_item_id']);
-          if (!$userCard) {
+            $userCard = \Ecommerce\Card\Item::get((int) $_POST['discounts']['card_item_id']);
+            if (!$userCard) {
             $error = true;
             Msg::add('Такой карты не существует');
-          } elseif ($userCard->user_id != $user->id) {
+            } elseif ($userCard->user_id != $user->id) {
             $error = true;
             Msg::add('Это не ваша карта');
-          } else {
+            } else {
             $cart->card_item_id = $userCard->id;
-          }
+            }
         }
         $cart->save();
         if (!$error && !empty($_POST['action']) && $_POST['action'] = 'order') {
-          $cart->user_id = $user->user_id;
-          $this->module->parseFields($_POST['userAdds']['fields'], $cart);
-          if ($payTypes && !empty($payTypes[$cart->paytype_id]) && !empty($_POST['deliveryFields'])) {
+            $cart->user_id = $user->user_id;
+            $this->module->parseFields($_POST['userAdds']['fields'], $cart);
+            if ($payTypes && !empty($payTypes[$cart->paytype_id]) && !empty($_POST['deliveryFields'])) {
             $this->module->parseDeliveryFields($_POST['deliveryFields'], $cart, $deliverys[$cart->delivery_id]->fields);
-          }
-          $cart->cart_status_id = 2;
-          $cart->comment = !empty($_POST['comment']) ? htmlspecialchars($_POST['comment']) : '';
-          $cart->date_status = date('Y-m-d H:i:s');
-          $cart->complete_data = date('Y-m-d H:i:s');
-          $cart->warehouse_block = 1;
-          $cart->save();
+            }
+            $cart->cart_status_id = 2;
+            $cart->comment = !empty($_POST['comment']) ? htmlspecialchars($_POST['comment']) : '';
+            $cart->date_status = date('Y-m-d H:i:s');
+            $cart->complete_data = date('Y-m-d H:i:s');
+            $cart->warehouse_block = 1;
+            $cart->save();
 
-          $cart = \Ecommerce\Cart::get($cart->id);
-          foreach ($cart->cartItems as $cartItem) {
+            $cart = \Ecommerce\Cart::get($cart->id);
+            foreach ($cart->cartItems as $cartItem) {
             $cartItem->discount = $cartItem->discount();
             $cartItem->final_price = $cartItem->price->price - $cartItem->discount;
             $cartItem->save();
-          }
-          $cart = \Ecommerce\Cart::get($cart->id);
-          if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
+            }
+            $cart = \Ecommerce\Cart::get($cart->id);
+            if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
             $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/admin/ecommerce/Cart">Админ панель</a>';
             $title = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
             \Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
-          }
-          if ($this->notifications) {
+            }
+            if ($this->notifications) {
             $notification = new Notifications\Notification();
             $notification->name = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
             $notification->text = 'Перейдите в админ панель чтобы просмотреть новый заказ';
             $notification->chanel_id = $this->notifications->getChanel('Ecommerce-orders')->id;
             $notification->save();
-          }
-          $handlers = $this->ecommerce->getSnippets('payTypeHandler');
-          $redirect = ['/ecommerce/cart/success'];
-          if ($payType && !empty($handlers[$payType->handler]['handler'])) {
+            }
+            $handlers = $this->ecommerce->getSnippets('payTypeHandler');
+            $redirect = ['/ecommerce/cart/success'];
+            if ($payType && !empty($handlers[$payType->handler]['handler'])) {
             $newRedirect = $handlers[$payType->handler]['handler']($cart);
             if (!empty($newRedirect)) {
-              $redirect = $newRedirect;
+                $redirect = $newRedirect;
+            }
             }
-          }
-          unset($_SESSION['cart']['cart_id']);
-          call_user_func_array(['Tools', 'redirect'], $redirect);
+            unset($_SESSION['cart']['cart_id']);
+            call_user_func_array(['Tools', 'redirect'], $redirect);
+        }
         }
-      }
     }
     $this->view->setTitle('Корзина');
     $bread = [];
@@ -161,12 +161,12 @@ 
         'href' => '/ecommerce/cart'
     ];
     $this->view->page(['data' => compact('cart', 'items', 'deliverys', 'payTypes', 'packItem', 'bread')]);
-  }
+    }
 
-  public function orderDetailAction($id = 0) {
+    public function orderDetailAction($id = 0) {
     $cart = Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      $this->url->redirect('/', 'Это не ваша корзина');
+        $this->url->redirect('/', 'Это не ваша корзина');
     }
     $bread[] = [
         'text' => 'Каталог',
@@ -182,54 +182,54 @@ 
     ];
     $this->view->setTitle('Заказ №' . $cart->id);
     $this->view->page(['data' => compact('cart', 'bread')]);
-  }
+    }
 
-  public function continueAction($id = 0) {
+    public function continueAction($id = 0) {
     $cart = \Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      Tools::redirect('/', 'Это не ваша корзина');
+        Tools::redirect('/', 'Это не ваша корзина');
     }
     if ($cart->cart_status_id > 1) {
-      Tools::redirect('/', 'Корзина уже оформлена');
+        Tools::redirect('/', 'Корзина уже оформлена');
     }
     $_SESSION['cart']['cart_id'] = $cart->id;
     Tools::redirect('/ecommerce/cart');
-  }
+    }
 
-  public function deleteAction($id = 0) {
+    public function deleteAction($id = 0) {
     $cart = \Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      Tools::redirect('/', 'Это не ваша корзина');
+        Tools::redirect('/', 'Это не ваша корзина');
     }
     if ($cart->cart_status_id > 1) {
-      Tools::redirect('/', 'Корзина уже оформлена');
+        Tools::redirect('/', 'Корзина уже оформлена');
     }
     if (!empty($_SESSION['cart']['cart_id']) && $_SESSION['cart']['cart_id'] == $cart->id) {
-      unset($_SESSION['cart']['cart_id']);
+        unset($_SESSION['cart']['cart_id']);
     }
     $cart->delete();
     Tools::redirect('/users/cabinet/ecommerceOrdersHistory', 'Корзина была удалена', 'success');
-  }
+    }
 
-  public function refillAction($id = 0) {
+    public function refillAction($id = 0) {
     $cart = \Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      Tools::redirect('/', 'Это не ваша корзина');
+        Tools::redirect('/', 'Это не ваша корзина');
     }
     if (!empty($_SESSION['cart']['cart_id'])) {
-      unset($_SESSION['cart']['cart_id']);
+        unset($_SESSION['cart']['cart_id']);
     }
     $newCart = $this->ecommerce->getCurCart();
     foreach ($cart->cartItems as $cartitem) {
-      $newCart->addItem($cartitem->item_offer_price_id, $cartitem->count);
+        $newCart->addItem($cartitem->item_offer_price_id, $cartitem->count);
     }
 
     $newCart->save();
 
     Tools::redirect('/ecommerce/cart/');
-  }
+    }
 
-  public function successAction() {
+    public function successAction() {
     $bread = [];
     $bread[] = [
         'text' => 'Каталог',
@@ -245,70 +245,70 @@ 
     ];
     $this->view->setTitle('Заказ принят');
     $this->view->page(['data' => compact('bread')]);
-  }
+    }
 
-  public function addAction() {
+    public function addAction() {
     $result = new Server\Result();
     if (empty($_GET['itemOfferPriceId'])) {
-      $result->success = false;
-      $result->content = 'Произошла непредвиденная ошибка при добавлении товара';
-      $result->send();
+        $result->success = false;
+        $result->content = 'Произошла непредвиденная ошибка при добавлении товара';
+        $result->send();
     }
     $price = \Ecommerce\Item\Offer\Price::get((int) $_GET['itemOfferPriceId']);
     if (!$price) {
-      $result->success = false;
-      $result->content = 'Такой цены не найдено';
-      $result->send();
+        $result->success = false;
+        $result->content = 'Такой цены не найдено';
+        $result->send();
     }
     $item = $price->offer->item;
 
     if (!$item) {
-      $result->success = false;
-      $result->content = 'Такого товара не существует';
-      $result->send();
+        $result->success = false;
+        $result->content = 'Такого товара не существует';
+        $result->send();
     }
 
     $item->sales ++;
     $item->save();
 
     if (empty($_GET['count']))
-      $count = 1;
+        $count = 1;
     else
-      $count = (float) $_GET['count'];
+        $count = (float) $_GET['count'];
 
     $cart = $this->ecommerce->getCurCart();
     $stages = Ecommerce\Cart\Stage::getList();
     if (empty($this->module->config['sell_over_warehouse']) && $price->offer->warehouseCount() < $count) {
-      $result->success = false;
-      $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
-      $result->send();
+        $result->success = false;
+        $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
+        $result->send();
     }
 
     $isset = false;
     foreach ($cart->cartItems as $cartItem) {
-      if ($cartItem->item_id == $item->id && $cartItem->item_offer_price_id == $price->id) {
+        if ($cartItem->item_id == $item->id && $cartItem->item_offer_price_id == $price->id) {
         $cartItem->count += $count;
         $cartItem->save();
         $isset = true;
         break;
-      }
+        }
     }
     if (!$isset) {
-      $cart->addItem($price->id, $count);
+        $cart->addItem($price->id, $count);
     }
     $cart->date_last_activ = date('Y-m-d H:i:s');
     $cart->calc();
     $result->successMsg = '<a href="/ecommerce/view/' . $item->id . '">' . $item->name() . ($price->offer->name() ? ' (' . $price->offer->name() . ')' : '') . '</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
     $result->send();
-  }
+    }
 
-  public function getcartAction() {
+    public function getcartAction() {
     $result = new Server\Result();
     ob_start();
     $this->view->widget('Ecommerce\cart');
     $result->content = ob_get_contents();
     ob_end_clean();
     $result->send();
-  }
+    }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -61,7 +61,7 @@ 
             $warecount = $cartitem->price->offer->warehouseCount($cart->id);
             if ($cartitem->count > $warecount) {
               $error = true;
-              Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+              Msg::add('Вы заказали <b>'.$cartitem->item->name.'</b> больше чем есть на складе. на складе: <b>'.$warecount.'</b>', 'danger');
             }
           }
         }
@@ -73,7 +73,7 @@ 
           foreach ($deliverys[$cart->delivery_id]->fields as $field) {
             if (empty($_POST['deliveryFields'][$field->id]) && $field->required) {
               $error = 1;
-              Msg::add('Вы не указали: ' . $field->name);
+              Msg::add('Вы не указали: '.$field->name);
             }
           }
         }
@@ -89,7 +89,7 @@ 
         foreach (\Ecommerce\UserAdds\Field::getList() as $field) {
           if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
             $error = 1;
-            Msg::add('Вы не указали: ' . $field->name);
+            Msg::add('Вы не указали: '.$field->name);
           }
         }
         if (!empty($_POST['discounts']['card_item_id'])) {
@@ -126,13 +126,13 @@ 
           }
           $cart = \Ecommerce\Cart::get($cart->id);
           if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
-            $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/admin/ecommerce/Cart">Админ панель</a>';
-            $title = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
-            \Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
+            $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/admin/ecommerce/Cart">Админ панель</a>';
+            $title = 'Новый заказ в интернет магазине на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
+            \Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
           }
           if ($this->notifications) {
             $notification = new Notifications\Notification();
-            $notification->name = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
+            $notification->name = 'Новый заказ в интернет магазине на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
             $notification->text = 'Перейдите в админ панель чтобы просмотреть новый заказ';
             $notification->chanel_id = $this->notifications->getChanel('Ecommerce-orders')->id;
             $notification->save();
@@ -177,10 +177,10 @@ 
         'href' => '/ecommerce/cart'
     ];
     $bread[] = [
-        'text' => 'Заказ: №' . $cart->id,
-        'href' => '/ecommerce/cart/orderDetail/' . $cart->id
+        'text' => 'Заказ: №'.$cart->id,
+        'href' => '/ecommerce/cart/orderDetail/'.$cart->id
     ];
-    $this->view->setTitle('Заказ №' . $cart->id);
+    $this->view->setTitle('Заказ №'.$cart->id);
     $this->view->page(['data' => compact('cart', 'bread')]);
   }
 
@@ -268,7 +268,7 @@ 
       $result->send();
     }
 
-    $item->sales ++;
+    $item->sales++;
     $item->save();
 
     if (empty($_GET['count']))
@@ -280,7 +280,7 @@ 
     $stages = Ecommerce\Cart\Stage::getList();
     if (empty($this->module->config['sell_over_warehouse']) && $price->offer->warehouseCount() < $count) {
       $result->success = false;
-      $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
+      $result->content = 'На складе недостаточно товара! Доступно: '.$price->offer->warehouseCount();
       $result->send();
     }
 
@@ -298,7 +298,7 @@ 
     }
     $cart->date_last_activ = date('Y-m-d H:i:s');
     $cart->calc();
-    $result->successMsg = '<a href="/ecommerce/view/' . $item->id . '">' . $item->name() . ($price->offer->name() ? ' (' . $price->offer->name() . ')' : '') . '</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
+    $result->successMsg = '<a href="/ecommerce/view/'.$item->id.'">'.$item->name().($price->offer->name() ? ' ('.$price->offer->name().')' : '').'</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
     $result->send();
   }
 

Braces +5 added lines, -4 removed lines

@@ -271,10 +271,11 @@
     $item->sales ++;
     $item->save();
 
-    if (empty($_GET['count']))
-      $count = 1;
-    else
-      $count = (float) $_GET['count'];
+    if (empty($_GET['count'])) {
+          $count = 1;
+    } else {
+          $count = (float) $_GET['count'];
+    }
 
     $cart = $this->ecommerce->getCurCart();
     $stages = Ecommerce\Cart\Stage::getList();

system/modules/Ecommerce/widgets/cart/delivery.php

Indentation +28 added lines, -28 removed lines

@@ -2,57 +2,57 @@
   <div class="col-md-4">
     <ul class="nav nav-pills nav-stacked">
       <?php
-      $hiddenId = Tools::randomString();
-      foreach ($deliverys as $delivery) {
+        $hiddenId = Tools::randomString();
+        foreach ($deliverys as $delivery) {
         if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || ($cart->delivery && $delivery->id == $cart->delivery->id)) {
-          $checked = 'checked';
+            $checked = 'checked';
         } else {
-          $checked = '';
+            $checked = '';
         }
         echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
         echo $delivery->name;
         echo '</a></li>';
-      }
-      $form->input('hidden', "delivery", '', [
-          'value' => $cart->delivery_id,
-          'attributes' => [
-              'id' => $hiddenId
-          ],
-      ]);
-      ?>
+        }
+        $form->input('hidden', "delivery", '', [
+            'value' => $cart->delivery_id,
+            'attributes' => [
+                'id' => $hiddenId
+            ],
+        ]);
+        ?>
     </ul>
   </div>
   <div class="col-md-8">
     <?php
     if ($cart->delivery) {
-      echo "<h4>Информация о доставке</h4>";
-      if ($cart->delivery->price_text || $cart->delivery->price) {
+        echo "<h4>Информация о доставке</h4>";
+        if ($cart->delivery->price_text || $cart->delivery->price) {
         echo "<div>Стоимость доставки: <b>" . ($cart->delivery->price_text ? $cart->delivery->price_text : ( $cart->delivery->price . ' ' . ($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.') )) . '</b></div>';
-      }
-      if ((float) $cart->delivery->max_cart_price) {
+        }
+        if ((float) $cart->delivery->max_cart_price) {
         echo '<div>При заказе товаров на сумму от ' . $cart->delivery->max_cart_price . ' руб - бесплатно</div>';
-      }
-      echo $cart->delivery->info;
-      if ($cart->delivery->fields) {
+        }
+        echo $cart->delivery->info;
+        if ($cart->delivery->fields) {
         echo '<hr />';
         foreach ($cart->delivery->fields as $field) {
-          $options = ['required' => $field->required];
-          if ($field->type == 'radio') {
+            $options = ['required' => $field->required];
+            if ($field->type == 'radio') {
             $values = $field->fieldItems(['forSelect' => true]);
             foreach ($values as $key => $value) {
-              $options['value'] = $key;
-              $form->input($field->type, "deliveryFields[{$field->id}]", $value, $options);
+                $options['value'] = $key;
+                $form->input($field->type, "deliveryFields[{$field->id}]", $value, $options);
             }
-          } else {
+            } else {
             if ($field->type == 'select') {
-              $options['values'] = $field->fieldItems(['forSelect' => true]);
+                $options['values'] = $field->fieldItems(['forSelect' => true]);
             }
             $form->input($field->type, "deliveryFields[{$field->id}]", $field->name, $options);
-          }
+            }
+        }
         }
-      }
     } else {
-      echo "<h4>Выберите способ доставки</h4>";
+        echo "<h4>Выберите способ доставки</h4>";
     }
     ?>
   </div>

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
         } else {
           $checked = '';
         }
-        echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
+        echo '<li'.($checked ? ' class="active"' : '').'><a href = "#" onclick = "document.getElementById(\''.$hiddenId.'\').value=\''.$delivery->id.'\';inji.Ecommerce.Cart.calcSum();return false;">';
         echo $delivery->name;
         echo '</a></li>';
       }
@@ -27,10 +27,10 @@ 
     if ($cart->delivery) {
       echo "<h4>Информация о доставке</h4>";
       if ($cart->delivery->price_text || $cart->delivery->price) {
-        echo "<div>Стоимость доставки: <b>" . ($cart->delivery->price_text ? $cart->delivery->price_text : ( $cart->delivery->price . ' ' . ($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.') )) . '</b></div>';
+        echo "<div>Стоимость доставки: <b>".($cart->delivery->price_text ? $cart->delivery->price_text : ($cart->delivery->price.' '.($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.'))).'</b></div>';
       }
       if ((float) $cart->delivery->max_cart_price) {
-        echo '<div>При заказе товаров на сумму от ' . $cart->delivery->max_cart_price . ' руб - бесплатно</div>';
+        echo '<div>При заказе товаров на сумму от '.$cart->delivery->max_cart_price.' руб - бесплатно</div>';
       }
       echo $cart->delivery->info;
       if ($cart->delivery->fields) {

system/modules/Ecommerce/models/Cart.php

Indentation +205 added lines, -205 removed lines

@@ -13,9 +13,9 @@ 
 
 class Cart extends \Model {
 
-  public static $objectName = 'Корзины';
+    public static $objectName = 'Корзины';
 
-  public static function indexes() {
+    public static function indexes() {
     return [
         'ecommerce_cartStatusBlock' => [
             'type' => 'INDEX',
@@ -37,9 +37,9 @@ 
             ]
         ],
     ];
-  }
+    }
 
-  public static function relations() {
+    public static function relations() {
     return [
         'user' => [
             'model' => 'Users\User',
@@ -97,279 +97,279 @@ 
             'model' => 'Ecommerce\Discount',
         ]
     ];
-  }
+    }
 
-  public function beforeDelete() {
+    public function beforeDelete() {
     foreach ($this->cartItems as $cartItem) {
-      $cartItem->delete();
+        $cartItem->delete();
     }
     foreach ($this->infos as $info) {
-      $info->delete();
+        $info->delete();
     }
     foreach ($this->extras as $extra) {
-      $extra->delete();
+        $extra->delete();
     }
     foreach ($this->events as $event) {
-      $event->delete();
+        $event->delete();
+    }
     }
-  }
 
-  public static $labels = [
-      'user_id' => 'Пользователь',
-      'cart_status_id' => 'Статус',
-      'delivery_id' => 'Доставка',
-      'comment' => 'Комментарий',
-      'bonus_used' => 'Выгодные рубли',
-      'complete_data' => 'Время заказа',
-      'info' => 'Информация',
-      'items' => 'Товары',
-      'paytype_id' => 'Способ оплаты',
-      'payed' => 'Оплачен',
-      'exported' => 'Выгружено',
-      'warehouse_block' => 'Блокировка товаров',
-      'extra' => 'Доп.',
-      'card_item_id' => 'Дисконтная карта',
-      'info' => 'Информация',
-      'contacts' => 'Информация',
-      'pay' => 'Счета',
-      'sums' => 'Суммы',
-      'deliveryInfo' => 'Для доставки',
-      'discount' => 'Скидки',
-  ];
-  public static $cols = [
-      //Основные параметры
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'cart_status_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'status'],
-      'delivery_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'delivery'],
-      'paytype_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'payType'],
-      'card_item_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'card'],
-      'warehouse_block' => ['type' => 'bool'],
-      'payed' => ['type' => 'bool'],
-      'comment' => ['type' => 'textarea'],
-      //Системные
-      'exported' => ['type' => 'bool'],
-      'complete_data' => ['type' => 'dateTime'],
-      'date_status' => ['type' => 'dateTime'],
-      'date_last_activ' => ['type' => 'dateTime'],
-      'date_create' => ['type' => 'dateTime'],
-      //Виджеты
-      'sums' => [
-          'type' => 'void',
-          'view' => [
-              'type' => 'widget',
-              'widget' => 'Ecommerce\adminSums',
-          ],
-      ],
-      'contacts' => [
-          'type' => 'void',
-          'view' => [
-              'type' => 'widget',
-              'widget' => 'Ecommerce\admin/contacts',
-          ],
-      ],
-      //Менеджеры
-      'extra' => ['type' => 'dataManager', 'relation' => 'extras'],
-      'pay' => ['type' => 'dataManager', 'relation' => 'pays'],
-      'items' => ['type' => 'dataManager', 'relation' => 'cartItems'],
-      'info' => ['type' => 'dataManager', 'relation' => 'infos'],
-      'deliveryInfo' => ['type' => 'dataManager', 'relation' => 'deliveryInfos'],
-      'discount' => ['type' => 'dataManager', 'relation' => 'discounts'],
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'cols' => [
-              'contacts',
-              'items',
-              'extra',
-              'discount',
-              'sums',
-              'cart_status_id',
-              'delivery_id',
-              'deliveryInfo',
-              'payed',
-              'pay',
-              'complete_data',
-          ],
-          'sortable' => [
-              'cart_status_id',
-              'delivery_id',
-              'payed',
-              'complete_data',
-          ],
-          'filters' => [
-              'cart_status_id',
-              'delivery_id',
-              'payed',
-              'complete_data',
-          ],
-          'preSort' => [
-              'complete_data' => 'desc'
-          ],
-          'actions' => [
-              'Ecommerce\CloseCartBtn', 'Open', 'Edit', 'Delete'
-          ]
-      ]
-  ];
+    public static $labels = [
+        'user_id' => 'Пользователь',
+        'cart_status_id' => 'Статус',
+        'delivery_id' => 'Доставка',
+        'comment' => 'Комментарий',
+        'bonus_used' => 'Выгодные рубли',
+        'complete_data' => 'Время заказа',
+        'info' => 'Информация',
+        'items' => 'Товары',
+        'paytype_id' => 'Способ оплаты',
+        'payed' => 'Оплачен',
+        'exported' => 'Выгружено',
+        'warehouse_block' => 'Блокировка товаров',
+        'extra' => 'Доп.',
+        'card_item_id' => 'Дисконтная карта',
+        'info' => 'Информация',
+        'contacts' => 'Информация',
+        'pay' => 'Счета',
+        'sums' => 'Суммы',
+        'deliveryInfo' => 'Для доставки',
+        'discount' => 'Скидки',
+    ];
+    public static $cols = [
+        //Основные параметры
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'cart_status_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'status'],
+        'delivery_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'delivery'],
+        'paytype_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'payType'],
+        'card_item_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'card'],
+        'warehouse_block' => ['type' => 'bool'],
+        'payed' => ['type' => 'bool'],
+        'comment' => ['type' => 'textarea'],
+        //Системные
+        'exported' => ['type' => 'bool'],
+        'complete_data' => ['type' => 'dateTime'],
+        'date_status' => ['type' => 'dateTime'],
+        'date_last_activ' => ['type' => 'dateTime'],
+        'date_create' => ['type' => 'dateTime'],
+        //Виджеты
+        'sums' => [
+            'type' => 'void',
+            'view' => [
+                'type' => 'widget',
+                'widget' => 'Ecommerce\adminSums',
+            ],
+        ],
+        'contacts' => [
+            'type' => 'void',
+            'view' => [
+                'type' => 'widget',
+                'widget' => 'Ecommerce\admin/contacts',
+            ],
+        ],
+        //Менеджеры
+        'extra' => ['type' => 'dataManager', 'relation' => 'extras'],
+        'pay' => ['type' => 'dataManager', 'relation' => 'pays'],
+        'items' => ['type' => 'dataManager', 'relation' => 'cartItems'],
+        'info' => ['type' => 'dataManager', 'relation' => 'infos'],
+        'deliveryInfo' => ['type' => 'dataManager', 'relation' => 'deliveryInfos'],
+        'discount' => ['type' => 'dataManager', 'relation' => 'discounts'],
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'cols' => [
+                'contacts',
+                'items',
+                'extra',
+                'discount',
+                'sums',
+                'cart_status_id',
+                'delivery_id',
+                'deliveryInfo',
+                'payed',
+                'pay',
+                'complete_data',
+            ],
+            'sortable' => [
+                'cart_status_id',
+                'delivery_id',
+                'payed',
+                'complete_data',
+            ],
+            'filters' => [
+                'cart_status_id',
+                'delivery_id',
+                'payed',
+                'complete_data',
+            ],
+            'preSort' => [
+                'complete_data' => 'desc'
+            ],
+            'actions' => [
+                'Ecommerce\CloseCartBtn', 'Open', 'Edit', 'Delete'
+            ]
+        ]
+    ];
 
-  public static function itemName($item) {
+    public static function itemName($item) {
     return $item->pk() . '. ' . $item->name();
-  }
+    }
 
-  public static $forms = [
-      'manager' => [
-          'inputs' => [
-              'userSearch' => [
-                  'type' => 'search',
-                  'source' => 'relation',
-                  'relation' => 'user',
-                  'label' => 'Покупатель',
-                  'cols' => [
-                      'info:first_name',
-                      'info:last_name',
-                      'info:middle_name',
-                      'mail'
-                  ],
-                  'col' => 'user_id',
-                  'required' => true,
-                  'showCol' => [
-                      'type' => 'staticMethod',
-                      'class' => 'Ecommerce\Cart',
-                      'method' => 'itemName',
-                  ],
-              ],
-              'cardSearch' => [
-                  'type' => 'search',
-                  'source' => 'relation',
-                  'relation' => 'card',
-                  'label' => 'Дисконтная карта',
-                  'cols' => [
-                      'code',
-                      'user:info:first_name',
-                      'user:info:last_name',
-                      'user:info:middle_name',
-                      'user:mail'
-                  ],
-                  'col' => 'card_item_id',
-              ],
-          ],
-          'map' => [
-              ['userSearch', 'cart_status_id'],
-              ['paytype_id', 'delivery_id'],
-              ['cardSearch', 'comment'],
-              ['warehouse_block', 'complete_data'],
-              ['payed'],
-              ['items'],
-              ['extra'],
-              ['pay'],
-              ['info'],
-              ['deliveryInfo']
-          ]
-      ],
-  ];
+    public static $forms = [
+        'manager' => [
+            'inputs' => [
+                'userSearch' => [
+                    'type' => 'search',
+                    'source' => 'relation',
+                    'relation' => 'user',
+                    'label' => 'Покупатель',
+                    'cols' => [
+                        'info:first_name',
+                        'info:last_name',
+                        'info:middle_name',
+                        'mail'
+                    ],
+                    'col' => 'user_id',
+                    'required' => true,
+                    'showCol' => [
+                        'type' => 'staticMethod',
+                        'class' => 'Ecommerce\Cart',
+                        'method' => 'itemName',
+                    ],
+                ],
+                'cardSearch' => [
+                    'type' => 'search',
+                    'source' => 'relation',
+                    'relation' => 'card',
+                    'label' => 'Дисконтная карта',
+                    'cols' => [
+                        'code',
+                        'user:info:first_name',
+                        'user:info:last_name',
+                        'user:info:middle_name',
+                        'user:mail'
+                    ],
+                    'col' => 'card_item_id',
+                ],
+            ],
+            'map' => [
+                ['userSearch', 'cart_status_id'],
+                ['paytype_id', 'delivery_id'],
+                ['cardSearch', 'comment'],
+                ['warehouse_block', 'complete_data'],
+                ['payed'],
+                ['items'],
+                ['extra'],
+                ['pay'],
+                ['info'],
+                ['deliveryInfo']
+            ]
+        ],
+    ];
 
-  public function checkStage() {
+    public function checkStage() {
     $sum = $this->itemsSum();
     $stages = Cart\Stage::getList(['order' => ['sum', 'asc']]);
     $groups = [];
     foreach ($stages as $stage) {
-      if ($sum->greater(new \Money\Sums([$stage->currency_id => $stage->sum])) || $sum->equal(new \Money\Sums([$stage->currency_id => $stage->sum]))) {
+        if ($sum->greater(new \Money\Sums([$stage->currency_id => $stage->sum])) || $sum->equal(new \Money\Sums([$stage->currency_id => $stage->sum]))) {
         $groups[$stage->group] = $stage;
-      }
+        }
     }
     $discounts = Cart\Discount::getList(['where' => ['cart_id', $this->id]]);
     foreach ($discounts as $discount) {
-      if (!isset($groups[$discount->group]) && $discount->auto) {
+        if (!isset($groups[$discount->group]) && $discount->auto) {
         $discount->delete();
-      }
-      if (isset($groups[$discount->group]) && $groups[$discount->group]->type == 'discount') {
+        }
+        if (isset($groups[$discount->group]) && $groups[$discount->group]->type == 'discount') {
         $discount->discount_id = $groups[$discount->group]->value;
         $discount->save();
         unset($groups[$discount->group]);
-      }
+        }
     }
     foreach ($groups as $group) {
-      if ($group && $group->type == 'discount') {
+        if ($group && $group->type == 'discount') {
         $rel = $this->addRelation('discounts', $group->value);
         $rel->auto = true;
         $rel->group = 'discount';
         $rel->save();
-      }
+        }
+    }
     }
-  }
 
-  public function needDelivery() {
+    public function needDelivery() {
     foreach ($this->cartItems as $cartItem) {
-      if ($cartItem->item->type && $cartItem->item->type->delivery) {
+        if ($cartItem->item->type && $cartItem->item->type->delivery) {
         return true;
-      }
+        }
     }
     return false;
-  }
+    }
 
-  public function deliverySum() {
+    public function deliverySum() {
     $sum = new \Money\Sums([]);
     if ($this->delivery && $this->needDelivery()) {
-      $sums = $this->itemsSum();
-      $deliveryPrice = new \Money\Sums([$this->delivery->currency_id => $this->delivery->max_cart_price]);
-      if ($this->delivery->max_cart_price && $sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) {
+        $sums = $this->itemsSum();
+        $deliveryPrice = new \Money\Sums([$this->delivery->currency_id => $this->delivery->max_cart_price]);
+        if ($this->delivery->max_cart_price && $sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) {
         $sum->sums = [$this->delivery->currency_id => 0];
-      } else if ($this->delivery->prices) {
+        } else if ($this->delivery->prices) {
         foreach ($this->delivery->prices(['order' => ['cart_price', 'asc']]) as $delPrice) {
-          $deliveryPrice = new \Money\Sums([$delPrice->currency_id => $delPrice->cart_price]);
-          if ($sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) {
+            $deliveryPrice = new \Money\Sums([$delPrice->currency_id => $delPrice->cart_price]);
+            if ($sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) {
             $sum->sums = [$delPrice->currency_id => $delPrice->price];
-          }
+            }
         }
         if (!$sum->sums) {
-          $sum->sums = [$this->delivery->currency_id => $this->delivery->price];
+            $sum->sums = [$this->delivery->currency_id => $this->delivery->price];
         }
-      } else {
+        } else {
         $sum->sums = [$this->delivery->currency_id => $this->delivery->price];
-      }
+        }
     }
     return $sum;
-  }
+    }
 
-  public function hasDiscount() {
+    public function hasDiscount() {
     return (bool) $this->card || $this->discounts;
-  }
+    }
 
-  public function discountSum() {
+    public function discountSum() {
     $sums = [];
     foreach ($this->cartItems as $cartItem) {
-      $sums[$cartItem->price->currency_id] = isset($sums[$cartItem->price->currency_id]) ? $sums[$cartItem->price->currency_id] + $cartItem->discount() * $cartItem->count : $cartItem->discount() * $cartItem->count;
+        $sums[$cartItem->price->currency_id] = isset($sums[$cartItem->price->currency_id]) ? $sums[$cartItem->price->currency_id] + $cartItem->discount() * $cartItem->count : $cartItem->discount() * $cartItem->count;
     }
     return new \Money\Sums($sums);
-  }
+    }
 
-  public function finalSum() {
+    public function finalSum() {
     $sums = $this->itemsSum();
     $sums = $sums->minus($this->discountSum());
     $sums = $sums->plus($this->deliverySum());
     return $sums;
-  }
+    }
 
-  public function itemsSum() {
+    public function itemsSum() {
     $cart = Cart::get($this->id);
     $sums = [];
     foreach ($cart->cartItems as $cartItem) {
-      if (!$cartItem->price) {
+        if (!$cartItem->price) {
         continue;
-      }
-      $sums[$cartItem->price->currency_id] = isset($sums[$cartItem->price->currency_id]) ? $sums[$cartItem->price->currency_id] + $cartItem->price->price * $cartItem->count : $cartItem->price->price * $cartItem->count;
+        }
+        $sums[$cartItem->price->currency_id] = isset($sums[$cartItem->price->currency_id]) ? $sums[$cartItem->price->currency_id] + $cartItem->price->price * $cartItem->count : $cartItem->price->price * $cartItem->count;
     }
     return new \Money\Sums($sums);
-  }
+    }
 
-  public function addItem($offer_price_id, $count = 1, $final_price = 0) {
+    public function addItem($offer_price_id, $count = 1, $final_price = 0) {
     $price = Item\Offer\Price::get((int) $offer_price_id);
 
     if (!$price) {
-      return false;
+        return false;
     }
 
     if ($count <= 0) {
-      $count = 1;
+        $count = 1;
     }
 
     $cartItem = new Cart\Item();
@@ -380,12 +380,12 @@ 
     $cartItem->final_price = $final_price ? $final_price : $price->price;
     $cartItem->save();
     return true;
-  }
+    }
 
-  public function calc($save = true) {
+    public function calc($save = true) {
     if ($save) {
-      $this->save();
+        $this->save();
+    }
     }
-  }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
   ];
 
   public static function itemName($item) {
-    return $item->pk() . '. ' . $item->name();
+    return $item->pk().'. '.$item->name();
   }
 
   public static $forms = [

system/modules/Ecommerce/models/Delivery.php

Indentation +56 added lines, -56 removed lines

@@ -13,62 +13,62 @@ 
 
 class Delivery extends \Model {
 
-  public static $objectName = 'Доставка';
-  public static $cols = [
-      //Основные параметры
-      'name' => ['type' => 'text'],
-      'price' => ['type' => 'decimal'],
-      'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
-      'price_text' => ['type' => 'textarea'],
-      'max_cart_price' => ['type' => 'decimal'],
-      'icon_file_id' => ['type' => 'image'],
-      'info' => ['type' => 'html'],
-      //Системные
-      'weight' => ['type' => 'number'],
-      'date_create' => ['type' => 'dateTime'],
-      //Менеджеры
-      'field' => ['type' => 'dataManager', 'relation' => 'fields'],
-      'priceChanger' => ['type' => 'dataManager', 'relation' => 'prices']
-  ];
-  public static $labels = [
-      'name' => 'Название',
-      'price' => 'Стоимость',
-      'price_text' => 'Текстовое описание стоимости (отображается вместо цены)',
-      'max_cart_price' => 'Басплатно при',
-      'icon_file_id' => 'Иконка',
-      'currency_id' => 'Валюта',
-      'info' => 'Дополнительная информация',
-      'priceChanger' => 'Градация стоимости',
-      'field' => 'Поля',
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Варианты доставки',
-          'cols' => [
-              'name',
-              'price',
-              'currency_id',
-              'max_cart_price',
-              'field',
-              'priceChanger'
-          ],
-          'sortMode' => true
-      ],
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name',],
-              ['max_cart_price', 'icon_file_id'],
-              ['price', 'currency_id'],
-              ['price_text'],
-              ['info'],
-              ['priceChanger'],
-              ['field']
-          ]
-  ]];
+    public static $objectName = 'Доставка';
+    public static $cols = [
+        //Основные параметры
+        'name' => ['type' => 'text'],
+        'price' => ['type' => 'decimal'],
+        'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
+        'price_text' => ['type' => 'textarea'],
+        'max_cart_price' => ['type' => 'decimal'],
+        'icon_file_id' => ['type' => 'image'],
+        'info' => ['type' => 'html'],
+        //Системные
+        'weight' => ['type' => 'number'],
+        'date_create' => ['type' => 'dateTime'],
+        //Менеджеры
+        'field' => ['type' => 'dataManager', 'relation' => 'fields'],
+        'priceChanger' => ['type' => 'dataManager', 'relation' => 'prices']
+    ];
+    public static $labels = [
+        'name' => 'Название',
+        'price' => 'Стоимость',
+        'price_text' => 'Текстовое описание стоимости (отображается вместо цены)',
+        'max_cart_price' => 'Басплатно при',
+        'icon_file_id' => 'Иконка',
+        'currency_id' => 'Валюта',
+        'info' => 'Дополнительная информация',
+        'priceChanger' => 'Градация стоимости',
+        'field' => 'Поля',
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Варианты доставки',
+            'cols' => [
+                'name',
+                'price',
+                'currency_id',
+                'max_cart_price',
+                'field',
+                'priceChanger'
+            ],
+            'sortMode' => true
+        ],
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name',],
+                ['max_cart_price', 'icon_file_id'],
+                ['price', 'currency_id'],
+                ['price_text'],
+                ['info'],
+                ['priceChanger'],
+                ['field']
+            ]
+    ]];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'icon' => [
             'model' => 'Files\File',
@@ -89,6 +89,6 @@ 
             'col' => 'delivery_id'
         ]
     ];
-  }
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
   public static $forms = [
       'manager' => [
           'map' => [
-              ['name',],
+              ['name', ],
               ['max_cart_price', 'icon_file_id'],
               ['price', 'currency_id'],
               ['price_text'],

system/modules/Ecommerce/models/Delivery/Field.php

Indentation +38 added lines, -38 removed lines

@@ -13,44 +13,44 @@ 
 
 class Field extends \Model {
 
-  public static $objectName = 'Поле доставки';
-  public static $cols = [
-      //Основные параметры
-      'name' => ['type' => 'text'],
-      'type' => ['type' => 'text'],
-      'userfield' => ['type' => 'text'],
-      'required' => ['type' => 'bool'],
-      'save' => ['type' => 'bool'],
-      'fieldItem'=>['type'=>'dataManager','relation'=>'fieldItems'],
-      //Системные
-      'date_create' => ['type' => 'dateTime'],
-  ];
-  public static $labels = [
-      'name' => 'Название',
-      'type' => 'Тип',
-      'userfield' => 'Связь с данными пользователя',
-      'required' => 'Обязательно',
-      'save' => 'Сохраняется',
-      'fieldItem' => 'Значения для списка',
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'cols' => [
-              'name', 'type', 'userfield', 'required','fieldItem',  'save'
-          ],
-      ]
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'type'],
-              ['required', 'save'],
-              [ 'userfield']
-          ]
-      ]
-  ];
+    public static $objectName = 'Поле доставки';
+    public static $cols = [
+        //Основные параметры
+        'name' => ['type' => 'text'],
+        'type' => ['type' => 'text'],
+        'userfield' => ['type' => 'text'],
+        'required' => ['type' => 'bool'],
+        'save' => ['type' => 'bool'],
+        'fieldItem'=>['type'=>'dataManager','relation'=>'fieldItems'],
+        //Системные
+        'date_create' => ['type' => 'dateTime'],
+    ];
+    public static $labels = [
+        'name' => 'Название',
+        'type' => 'Тип',
+        'userfield' => 'Связь с данными пользователя',
+        'required' => 'Обязательно',
+        'save' => 'Сохраняется',
+        'fieldItem' => 'Значения для списка',
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'cols' => [
+                'name', 'type', 'userfield', 'required','fieldItem',  'save'
+            ],
+        ]
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'type'],
+                ['required', 'save'],
+                [ 'userfield']
+            ]
+        ]
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'fieldItems' => [
             'model' => 'Ecommerce\Delivery\Field\Item',
@@ -58,6 +58,6 @@ 
             'type' => 'many'
         ],
     ];
-  }
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
       'userfield' => ['type' => 'text'],
       'required' => ['type' => 'bool'],
       'save' => ['type' => 'bool'],
-      'fieldItem'=>['type'=>'dataManager','relation'=>'fieldItems'],
+      'fieldItem'=>['type'=>'dataManager', 'relation'=>'fieldItems'],
       //Системные
       'date_create' => ['type' => 'dateTime'],
   ];
@@ -36,7 +36,7 @@ 
   public static $dataManagers = [
       'manager' => [
           'cols' => [
-              'name', 'type', 'userfield', 'required','fieldItem',  'save'
+              'name', 'type', 'userfield', 'required', 'fieldItem', 'save'
           ],
       ]
   ];
@@ -45,7 +45,7 @@ 
           'map' => [
               ['name', 'type'],
               ['required', 'save'],
-              [ 'userfield']
+              ['userfield']
           ]
       ]
   ];

system/modules/Ecommerce/models/Delivery/DeliveryFieldLink.php

Indentation +25 added lines, -25 removed lines

@@ -13,31 +13,31 @@ 
 
 class DeliveryFieldLink extends \Model {
 
-  public static $labels = [
-      'delivery_id' => 'Тип доставки',
-      'delivery_field_id' => 'Поле доставки'
-  ];
-  public static $cols = [
-      'delivery_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'delivery'],
-      'delivery_field_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'field'],
-      'weight' => ['type' => 'number'],
-      'date_create' => ['type' => 'dateTime']
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Поля для доставки',
-          'cols' => ['delivery_id', 'delivery_field_id', 'date_create'],
-      ]
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['delivery_id', 'delivery_field_id'],
-          ]
-      ]
-  ];
+    public static $labels = [
+        'delivery_id' => 'Тип доставки',
+        'delivery_field_id' => 'Поле доставки'
+    ];
+    public static $cols = [
+        'delivery_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'delivery'],
+        'delivery_field_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'field'],
+        'weight' => ['type' => 'number'],
+        'date_create' => ['type' => 'dateTime']
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Поля для доставки',
+            'cols' => ['delivery_id', 'delivery_field_id', 'date_create'],
+        ]
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['delivery_id', 'delivery_field_id'],
+            ]
+        ]
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'field' => [
             'model' => 'Ecommerce\Delivery\Field',
@@ -48,6 +48,6 @@ 
             'col' => 'delivery_id'
         ],
     ];
-  }
+    }
 
 }

system/modules/Ecommerce/models/Delivery/Price.php

Indentation +29 added lines, -29 removed lines

@@ -13,35 +13,35 @@ 
 
 class Price extends \Model {
 
-  public static $labels = [
-      'delivery_id' => 'Тип доставки',
-      'cart_price' => 'Сумма корзины',
-      'price' => 'Стоимость доставки',
-      'currency_id' => 'Валюта',
-  ];
-  public static $cols = [
-      'delivery_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'delivery'],
-      'cart_price' => ['type' => 'number'],
-      'price' => ['type' => 'number'],
-      'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
-      'date_create' => ['type' => 'dateTime']
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Цены для стоимости корзин',
-          'cols' => ['delivery_id', 'cart_price', 'price', 'currency_id'],
-      ]
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['delivery_id', 'currency_id'],
-              ['cart_price', 'price'],
-          ]
-      ]
-  ];
+    public static $labels = [
+        'delivery_id' => 'Тип доставки',
+        'cart_price' => 'Сумма корзины',
+        'price' => 'Стоимость доставки',
+        'currency_id' => 'Валюта',
+    ];
+    public static $cols = [
+        'delivery_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'delivery'],
+        'cart_price' => ['type' => 'number'],
+        'price' => ['type' => 'number'],
+        'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
+        'date_create' => ['type' => 'dateTime']
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Цены для стоимости корзин',
+            'cols' => ['delivery_id', 'cart_price', 'price', 'currency_id'],
+        ]
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['delivery_id', 'currency_id'],
+                ['cart_price', 'price'],
+            ]
+        ]
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'delivery' => [
             'model' => 'Ecommerce\Delivery',
@@ -52,6 +52,6 @@ 
             'col' => 'currency_id'
         ],
     ];
-  }
+    }
 
 }