injitools / cms-Inji

system/modules/Ecommerce/appControllers/content/Cart/index.php

Indentation +26 added lines, -26 removed lines

@@ -61,12 +61,12 @@ 
                 </div>
               </div>
               <?php
-              $packchecked = '';
-              $packItem = false;
-              $packSum = 0;
-              if ($packItem) {
-                  $packchecked = ((!empty($_POST) && empty($_POST['packs']))) ? '' : 'checked';
-                  ?>
+                $packchecked = '';
+                $packItem = false;
+                $packSum = 0;
+                if ($packItem) {
+                    $packchecked = ((!empty($_POST) && empty($_POST['packs']))) ? '' : 'checked';
+                    ?>
                   <fieldset id="additional">
                     <h2 class="secondary-title">Дополнительно</h2>
                     <div class=" checkout-payment-form">
@@ -89,8 +89,8 @@ 
                     </div>
                   </fieldset>
                   <?php
-              }
-              ?>
+                }
+                ?>
             </div>                                    
           </div>
           <div class="col-sm-8">
@@ -115,24 +115,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) || $payType->id == $cartPayType->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' => $cartPayType->id,
-                              'attributes' => [
-                                  'id' => $hiddenId
-                              ],
-                          ]);
-                          ?>
+                            $hiddenId = Tools::randomString();
+                            foreach ($payTypes as $payType) {
+                                if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || $payType->id == $cartPayType->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' => $cartPayType->id,
+                                'attributes' => [
+                                    'id' => $hiddenId
+                                ],
+                            ]);
+                            ?>
                         </ul>
                       </div>
                       <div class="col-md-8">

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
                     <h3 class="panel-title">Способ доставки</h3>
                   </div>
                   <div class="panel-body">
-                    <?php $this->widget('Ecommerce\cart/delivery', compact('form','cart','deliverys', 'cartDelivery')); ?>
+                    <?php $this->widget('Ecommerce\cart/delivery', compact('form', 'cart', 'deliverys', 'cartDelivery')); ?>
                   </div>
                 </div>
               </div>

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

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
             'map' => [
                 ['name', 'type'],
                 ['required', 'save'],
-                [ 'userfield']
+                ['userfield']
             ]
         ]
     ];

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) || $delivery->id == $cartDelivery->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' => $cartDelivery->id,

-          'attributes' => [

-              'id' => $hiddenId

-          ],

-      ]);

-      ?>

+        $hiddenId = Tools::randomString();

+        foreach ($deliverys as $delivery) {

+            if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || $delivery->id == $cartDelivery->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' => $cartDelivery->id,

+            'attributes' => [

+                'id' => $hiddenId

+            ],

+        ]);

+        ?>

     </ul>

   </div>

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

Spacing +2 added lines, -2 removed lines

@@ -27,13 +27,13 @@
     <?php

     $delivery = $cartDelivery;

     if ($delivery->price_text || $delivery->price) {

-        echo "<div>Стоимость доставки: <b>" . ($delivery->price_text ? $delivery->price_text : ( $delivery->price . ' ' . ($delivery->currency ? $delivery->currency->acronym() : 'руб.') )) . '</b></div>';

+        echo "<div>Стоимость доставки: <b>" . ($delivery->price_text ? $delivery->price_text : ($delivery->price . ' ' . ($delivery->currency ? $delivery->currency->acronym() : 'руб.'))) . '</b></div>';

     }

     if ((float) $delivery->max_cart_price) {

         echo '<div>При заказе товаров на сумму от ' . $delivery->max_cart_price . ' руб - бесплатно</div>';

     }

     echo $delivery->info;

-    if($delivery->fields) {

+    if ($delivery->fields) {

         echo '<hr \>';

         foreach ($delivery->fields as $field) {

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

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

Indentation +16 added lines, -16 removed lines

@@ -1,16 +1,16 @@ 
 <fieldset>
   <?php
-  if (\Users\User::$cur->id) {
-      $userAdds = Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id]]);
-      $values = [];
-      foreach ($userAdds as $userAdd) {
-          $values[$userAdd->id] = $userAdd->values(['array' => true]);
-      }
-      if ($userAdds) {
-          $form->input('select', 'userAddsId', 'Ваши контакты', ['values' => ['' => 'Выберите'] + Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id], 'forSelect' => true])]);
-          echo '<hr />';
-      }
-      ?>
+    if (\Users\User::$cur->id) {
+        $userAdds = Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id]]);
+        $values = [];
+        foreach ($userAdds as $userAdd) {
+            $values[$userAdd->id] = $userAdd->values(['array' => true]);
+        }
+        if ($userAdds) {
+            $form->input('select', 'userAddsId', 'Ваши контакты', ['values' => ['' => 'Выберите'] + Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id], 'forSelect' => true])]);
+            echo '<hr />';
+        }
+        ?>
       <script>
           var userAddsValues = <?= json_encode($values); ?>;
           inji.onLoad(function () {
@@ -24,9 +24,9 @@ 
           })
       </script>
       <?php
-  }
-  foreach (Ecommerce\UserAdds\Field::getList(['order' => ['weight', 'asc']]) as $field) {
-      $form->input($field->type, "userAdds[fields][{$field->id}]", $field->name, ['required' => $field->required]);
-  }
-  ?>
+    }
+    foreach (Ecommerce\UserAdds\Field::getList(['order' => ['weight', 'asc']]) as $field) {
+        $form->input($field->type, "userAdds[fields][{$field->id}]", $field->name, ['required' => $field->required]);
+    }
+    ?>
 </fieldset>
\ No newline at end of file