injitools / cms-Inji

system/modules/Money/models/Merchant/Currency.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php

 /**

- * Merchant currency

- *

- * @author Alexey Krupskiy <admin@inji.ru>

- * @link http://inji.ru/

- * @copyright 2015 Alexey Krupskiy

- * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE

- */

+     * Merchant currency

+     *

+     * @author Alexey Krupskiy <admin@inji.ru>

+     * @link http://inji.ru/

+     * @copyright 2015 Alexey Krupskiy

+     * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE

+     */

 namespace Money\Merchant;

 

 class Currency extends \Model

system/modules/Money/models/Transfer.php

Spacing +3 added lines, -3 removed lines

@@ -48,16 +48,16 @@
             ],
             'name' => 'Переводы',
             'cols' => [
-                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled','date_create'
+                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled', 'date_create'
             ],
             'actions' => [
                 'Money\CancelTransfer', 'Money\CompleteTransfer'
             ],
             'sortable' => [
-                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled','date_create'
+                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled', 'date_create'
             ],
             'filters' => [
-                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled','date_create'
+                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled', 'date_create'
             ]
         ]
     ];

system/modules/Money/Money.php

Spacing +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
             if (empty($blocks[$block->wallet->currency_id])) {
                 $blocks[$block->wallet->currency_id] = $block->amount;
             } else {
-                $blocks[$block->wallet->currency_id]+= $block->amount;
+                $blocks[$block->wallet->currency_id] += $block->amount;
             }
         }
         return $blocks;
@@ -168,7 +168,7 @@ 
         $rootUser = $rootUser ? $rootUser : \Users\User::$cur;
         $reward = \Money\Reward::get($reward_id);
         $reward->checkBlocked();
-        $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id]]);
+        $reward_count = \Money\Reward\Recive::getCount(['where' => ['reward_id', $reward_id]]);
         if ($reward_count >= $reward->quantity && $reward->quantity)
             return false;
         $types = $this->getSnippets('rewardType');
@@ -189,7 +189,7 @@ 
                 $recives = \Money\Reward\Recive::getList(['where' => [['user_id', $user->id], ['reward_id', $reward->id]]]);
                 $amount = 0;
                 foreach ($recives as $recive) {
-                    $amount+=$recive->amount;
+                    $amount += $recive->amount;
                 }
                 if ($amount >= $reward->peruser) {
                     continue;

system/modules/Money/objects/Sums.php

Spacing +7 added lines, -7 removed lines

@@ -61,21 +61,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/models/Cart.php

Spacing +1 added lines, -1 removed lines

@@ -282,7 +282,7 @@
                 $groups[$stage->group] = $stage;
             }
         }
-        $discounts = Cart\Discount::getList(['where'=>['cart_id',$this->id]]);
+        $discounts = Cart\Discount::getList(['where'=>['cart_id', $this->id]]);
         foreach ($discounts as $discount) {
             if (!isset($groups[$discount->group]) && $discount->auto) {
                 $discount->delete();

system/modules/Ecommerce/models/Item/Type.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         'manager' => [
             'map' => [
                 ['name', 'code'],
-                ['delivery', 'electronic','discount']
+                ['delivery', 'electronic', 'discount']
             ]
         ]
     ];

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

Indentation +18 added lines, -18 removed lines

@@ -2,24 +2,24 @@
   <div class="col-md-4">
     <ul class="nav nav-pills nav-stacked">
       <?php
-      $hiddenId = Tools::randomString();
-      foreach ($payTypes as $payType) {
-          if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) {
-              $checked = 'checked';
-          } else {
-              $checked = '';
-          }
-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
-          echo $payType->name;
-          echo '</a></li>';
-      }
-      $form->input('hidden', "payType", '', [
-          'value' => $cart->paytype_id,
-          'attributes' => [
-              'id' => $hiddenId
-          ],
-      ]);
-      ?>
+        $hiddenId = Tools::randomString();
+        foreach ($payTypes as $payType) {
+            if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) {
+                $checked = 'checked';
+            } else {
+                $checked = '';
+            }
+            echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
+            echo $payType->name;
+            echo '</a></li>';
+        }
+        $form->input('hidden', "payType", '', [
+            'value' => $cart->paytype_id,
+            'attributes' => [
+                'id' => $hiddenId
+            ],
+        ]);
+        ?>
     </ul>
   </div>
   <div class="col-md-8">

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

Indentation +18 added lines, -18 removed lines

@@ -2,24 +2,24 @@
   <div class="col-md-4">

     <ul class="nav nav-pills nav-stacked">

       <?php

-      $hiddenId = Tools::randomString();

-      foreach ($deliverys as $delivery) {

-          if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || ($cart->delivery && $delivery->id == $cart->delivery->id)) {

-              $checked = 'checked';

-          } else {

-              $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

-          ],

-      ]);

-      ?>

+        $hiddenId = Tools::randomString();

+        foreach ($deliverys as $delivery) {

+            if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || ($cart->delivery && $delivery->id == $cart->delivery->id)) {

+                $checked = 'checked';

+            } else {

+                $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

+            ],

+        ]);

+        ?>

     </ul>

   </div>

   <div class="col-md-8">

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     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>';

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
                 $form->input($field->type, "deliveryFields[{$field->id}]", $field->name, ['required' => $field->required]);

             }

         }

-    }

-    else {

+    } else {

         echo "<h4>Выберите способ доставки</h4>";

     }

     ?>

system/modules/Migrations/objects/Parser/Object.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
                         } else {
                             $parserName = '\Migrations\Parser\Object\\' . ucfirst($param->type);
                         }
-                        if (!in_array($parserName, ['\Migrations\Parser\Object\ObjectLink','Exchange1c\Parser\Item\Images', '\Migrations\Parser\Object\Value', '\Migrations\Parser\Object\Relation', '\Migrations\Parser\Object\ParamsList'])) {
+                        if (!in_array($parserName, ['\Migrations\Parser\Object\ObjectLink', 'Exchange1c\Parser\Item\Images', '\Migrations\Parser\Object\Value', '\Migrations\Parser\Object\Relation', '\Migrations\Parser\Object\ParamsList'])) {
                             var_dump($parserName);
                             exit();
                         }