injitools / cms-Inji

system/modules/Ecommerce/appControllers/CartController.php

Spacing +1 added lines, -1 removed lines

@@ -268,7 +268,7 @@
             $result->send();
         }
 
-        $item->sales ++;
+        $item->sales++;
         $item->save();
 
         if (empty($_GET['count']))

Braces +5 added lines, -4 removed lines

@@ -270,10 +270,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();
 

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

Braces +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@
   <div class="cart-order_page">
     <h2>Быстрое оформление заказа</h2>
     <?php
-    if (!$cart || !$cart->cartItems)
-        echo "<h1>Ваша корзина пуста</h1>";
-    else {
+    if (!$cart || !$cart->cartItems) {
+            echo "<h1>Ваша корзина пуста</h1>";
+    } else {
         $sums = [];
         $cartDelivery = $cart->delivery;
         $deliveryPrice = 0;

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/appControllers/content/Cart/orderDetail.php

Indentation +87 added lines, -87 removed lines

@@ -6,11 +6,11 @@ 
     </tr>
   </thead>
   <?php
-  $orderDeatilCols = [
-      'id' => '№ Заказа',
-      'complete_data' => 'Дата заказа'
-  ];
-  ?>
+    $orderDeatilCols = [
+        'id' => '№ Заказа',
+        'complete_data' => 'Дата заказа'
+    ];
+    ?>
   <tbody>
     <tr>
       <td class="text-left" style="width: 50%;">              
@@ -63,91 +63,91 @@ 
     </thead>
     <tbody>
       <?php
-      $sums = [];
-      foreach ($cart->cartItems as $cartItem) {
-          $item = $cartItem->item;
-          $itemName = $item->name();
-          if (!isset($sums[$cartItem->price->currency_id])) {
-              $sums[$cartItem->price->currency_id] = $cartItem->price->price;
-          } else {
-              $sums[$cartItem->price->currency_id] += $cartItem->price->price;
-          }
-          ?>
+        $sums = [];
+        foreach ($cart->cartItems as $cartItem) {
+            $item = $cartItem->item;
+            $itemName = $item->name();
+            if (!isset($sums[$cartItem->price->currency_id])) {
+                $sums[$cartItem->price->currency_id] = $cartItem->price->price;
+            } else {
+                $sums[$cartItem->price->currency_id] += $cartItem->price->price;
+            }
+            ?>
           <tr>
             <td class="text-left"><?= $itemName; ?></td>
             <td class="text-right"><?= $cartItem->count; ?></td>
             <td class="text-right"><?= $cartItem->price->price; ?> 
               <?php
-              if (App::$cur->money) {
-                  $currency = Money\Currency::get($cartItem->price->currency_id);
-                  if ($currency) {
-                      echo $currency->acronym();
-                  } else {
-                      echo 'руб.';
-                  }
-              } else {
-                  echo 'руб.';
-              }
-              ?></td>
+                if (App::$cur->money) {
+                    $currency = Money\Currency::get($cartItem->price->currency_id);
+                    if ($currency) {
+                        echo $currency->acronym();
+                    } else {
+                        echo 'руб.';
+                    }
+                } else {
+                    echo 'руб.';
+                }
+                ?></td>
             <td class="text-right"><?= ($cartItem->price->price * $cartItem->count); ?>
               <?php
-              if (App::$cur->money) {
-                  $currency = Money\Currency::get($cartItem->price->currency_id);
-                  if ($currency) {
-                      echo $currency->acronym();
-                  } else {
-                      echo 'руб.';
-                  }
-              } else {
-                  echo 'руб.';
-              }
-              ?></td>
+                if (App::$cur->money) {
+                    $currency = Money\Currency::get($cartItem->price->currency_id);
+                    if ($currency) {
+                        echo $currency->acronym();
+                    } else {
+                        echo 'руб.';
+                    }
+                } else {
+                    echo 'руб.';
+                }
+                ?></td>
             <td class="text-right" style="white-space: nowrap;">
               <a onclick = 'inji.Ecommerce.Cart.addItem(<?= $item->getPrice()->id; ?>, 1);
                         return false;' data-original-title="Добавить в корзину" href="#" data-toggle="tooltip" title="" class="btn btn-primary"><i class="glyphicon glyphicon-shopping-cart"></i></a>
           </tr>
           <?php
-      }
-      ?>
+        }
+        ?>
     </tbody>
     <tfoot>
       <tr>
         <td colspan="2"></td>
         <td class="text-right"><b>Сумма</b></td>
         <td class="text-right"><?php
-          foreach ($sums as $currency_id => $sum) {
-              if (!$sum) {
-                  continue;
-              }
-              echo number_format($sum, 2, '.', ' ');
-              if (App::$cur->money) {
-                  $currency = Money\Currency::get($currency_id);
-                  if ($currency) {
-                      echo '&nbsp;' . $currency->acronym();
-                  } else {
-                      echo '&nbsp;руб.';
-                  }
-              } else {
-                  echo '&nbsp;руб.';
-              }
-              echo '<br />';
-          }
-          ?></td>
+            foreach ($sums as $currency_id => $sum) {
+                if (!$sum) {
+                    continue;
+                }
+                echo number_format($sum, 2, '.', ' ');
+                if (App::$cur->money) {
+                    $currency = Money\Currency::get($currency_id);
+                    if ($currency) {
+                        echo '&nbsp;' . $currency->acronym();
+                    } else {
+                        echo '&nbsp;руб.';
+                    }
+                } else {
+                    echo '&nbsp;руб.';
+                }
+                echo '<br />';
+            }
+            ?></td>
         <td></td>
       </tr>
       <?php
-      $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
-      $deliveryPrice = $cart->delivery->price;
-      if (!isset($sums[$deliveryCurrency])) {
-          $sums[$deliveryCurrency] = $deliveryPrice;
-      } else {
-          $sums[$deliveryCurrency] += $deliveryPrice;
-      }
-      $delCurrency = false;
-      if (App::$cur->money) {
-          $delCurrency = Money\Currency::get($deliveryPrice);
-      }
-      ?>
+        $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
+        $deliveryPrice = $cart->delivery->price;
+        if (!isset($sums[$deliveryCurrency])) {
+            $sums[$deliveryCurrency] = $deliveryPrice;
+        } else {
+            $sums[$deliveryCurrency] += $deliveryPrice;
+        }
+        $delCurrency = false;
+        if (App::$cur->money) {
+            $delCurrency = Money\Currency::get($deliveryPrice);
+        }
+        ?>
       <tr>
         <td colspan="2"></td>
         <td class="text-right"><b><?= $cart->delivery ? $cart->delivery->name : 'Доставка'; ?></b></td>
@@ -158,24 +158,24 @@ 
         <td colspan="2"></td>
         <td class="text-right"><b>Итого</b></td>
         <td class="text-right"><?php
-          foreach ($sums as $currency_id => $sum) {
-              if (!$sum) {
-                  continue;
-              }
-              echo number_format($sum, 2, '.', ' ');
-              if (App::$cur->money) {
-                  $currency = Money\Currency::get($currency_id);
-                  if ($currency) {
-                      echo '&nbsp;' . $currency->acronym();
-                  } else {
-                      echo '&nbsp;руб.';
-                  }
-              } else {
-                  echo '&nbsp;руб.';
-              }
-              echo '<br />';
-          }
-          ?></td>
+            foreach ($sums as $currency_id => $sum) {
+                if (!$sum) {
+                    continue;
+                }
+                echo number_format($sum, 2, '.', ' ');
+                if (App::$cur->money) {
+                    $currency = Money\Currency::get($currency_id);
+                    if ($currency) {
+                        echo '&nbsp;' . $currency->acronym();
+                    } else {
+                        echo '&nbsp;руб.';
+                    }
+                } else {
+                    echo '&nbsp;руб.';
+                }
+                echo '<br />';
+            }
+            ?></td>
         <td></td>
       </tr>
     </tfoot>

system/modules/Ecommerce/appControllers/content/buyCard.php

Indentation +4 added lines, -4 removed lines

@@ -50,12 +50,12 @@
                       <td>
                         <ul>
                           <?php
-                          foreach ($card->levels as $level) {
-                              ?>
+                            foreach ($card->levels as $level) {
+                                ?>
                               <li><?= $level->name; ?> - <?= $level->discount->name; ?></li>
                               <?php
-                          }
-                          ?>
+                            }
+                            ?>
                         </ul>
                       </td>
                       <td>

system/modules/Ecommerce/models/Cart.php

Braces +3 added lines, -2 removed lines

@@ -275,8 +275,9 @@
                 break;
             }
         }
-        if (!$price)
-            return false;
+        if (!$price) {
+                    return false;
+        }
 
         if ($count <= 0) {
             $count = 1;

system/modules/Ecommerce/models/Delivery.php

Spacing +1 added lines, -1 removed lines

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

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

Spacing +2 added lines, -2 removed lines

@@ -72,12 +72,12 @@
     {
         $warehouse = Offer\Warehouse::get([['count', '0', '>'], ['item_offer_id', $this->id]]);
         if ($warehouse) {
-            $warehouse->count +=(float) $count;
+            $warehouse->count += (float) $count;
             $warehouse->save();
         } else {
             $warehouse = Offer\Warehouse::get([['item_offer_id', $this->id]]);
             if ($warehouse) {
-                $warehouse->count +=(float) $count;
+                $warehouse->count += (float) $count;
                 $warehouse->save();
             }
         }

system/modules/Ecommerce/models/Item/Offer/Price.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     static $forms = [
         'manager' => [
             'map' => [
-                ['price', 'currency_id',],
+                ['price', 'currency_id', ],
                 ['item_offer_price_type_id', 'item_offer_id']
             ]
     ]];

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

Indentation +71 added lines, -71 removed lines

@@ -19,87 +19,87 @@ 
     </thead>
     <tbody>
       <?php
-      foreach ($carts as $cart) {
-          $sums = [];
-          foreach ($cart->cartItems as $cartItem) {
-              $currency_id = $cartItem->price && $cartItem->price->currency ? $cartItem->price->currency->id : (!empty(\App::$cur->ecommerce->config['defaultCurrency']) ? \App::$cur->ecommerce->config['defaultCurrency'] : 0);
-              if (empty($sums[$currency_id])) {
-                  $sums[$currency_id] = $cartItem->final_price * $cartItem->count;
-              } else {
-                  $sums[$currency_id] += $cartItem->final_price * $cartItem->count;
-              }
-          }
-          if ($cart->delivery && $cart->delivery->price) {
-              $currency_id = $cart->delivery->currency_id;
-              if (empty($sums[$currency_id])) {
-                  $sums[$currency_id] = $cart->delivery->price;
-              } else {
-                  $sums[$currency_id] += $cart->delivery->price;
-              }
-          }
-          foreach ($cart->extras as $extra) {
-              $currency_id = $extra->currency ? $extra->currency->id : \App::$cur->ecommerce->config['defaultCurrency'];
-              if (empty($sums[$currency_id])) {
-                  $sums[$currency_id] = $extra->price * $extra->count;
-              } else {
-                  $sums[$currency_id] += $extra->price * $extra->count;
-              }
-          }
-          ?>
+        foreach ($carts as $cart) {
+            $sums = [];
+            foreach ($cart->cartItems as $cartItem) {
+                $currency_id = $cartItem->price && $cartItem->price->currency ? $cartItem->price->currency->id : (!empty(\App::$cur->ecommerce->config['defaultCurrency']) ? \App::$cur->ecommerce->config['defaultCurrency'] : 0);
+                if (empty($sums[$currency_id])) {
+                    $sums[$currency_id] = $cartItem->final_price * $cartItem->count;
+                } else {
+                    $sums[$currency_id] += $cartItem->final_price * $cartItem->count;
+                }
+            }
+            if ($cart->delivery && $cart->delivery->price) {
+                $currency_id = $cart->delivery->currency_id;
+                if (empty($sums[$currency_id])) {
+                    $sums[$currency_id] = $cart->delivery->price;
+                } else {
+                    $sums[$currency_id] += $cart->delivery->price;
+                }
+            }
+            foreach ($cart->extras as $extra) {
+                $currency_id = $extra->currency ? $extra->currency->id : \App::$cur->ecommerce->config['defaultCurrency'];
+                if (empty($sums[$currency_id])) {
+                    $sums[$currency_id] = $extra->price * $extra->count;
+                } else {
+                    $sums[$currency_id] += $extra->price * $extra->count;
+                }
+            }
+            ?>
           <tr>
             <td class="text-right">#<?= $cart->id; ?></td>
             <td class="text-left"><?= $cart->status ? $cart->status->name : 'Наполняется'; ?></td>
             <td class="text-right"><?= count($cart->cartItems); ?></td>
             <td class="text-right"><?php
-              if ($sums) {
-                  foreach ($sums as $currency_id => $sum) {
-                      if (!$sum) {
-                          continue;
-                      }
-                      echo number_format($sum, 2, '.', ' ');
-                      if (App::$cur->money) {
-                          $currency = Money\Currency::get($currency_id);
-                          if ($currency) {
-                              echo '&nbsp;' . $currency->acronym();
-                          } else {
-                              echo '&nbsp;р.';
-                          }
-                      } else {
-                          echo '&nbsp;р.';
-                      }
-                      echo '<br />';
-                  }
-              }
-              ?></td>
+                if ($sums) {
+                    foreach ($sums as $currency_id => $sum) {
+                        if (!$sum) {
+                            continue;
+                        }
+                        echo number_format($sum, 2, '.', ' ');
+                        if (App::$cur->money) {
+                            $currency = Money\Currency::get($currency_id);
+                            if ($currency) {
+                                echo '&nbsp;' . $currency->acronym();
+                            } else {
+                                echo '&nbsp;р.';
+                            }
+                        } else {
+                            echo '&nbsp;р.';
+                        }
+                        echo '<br />';
+                    }
+                }
+                ?></td>
             <td class="text-left"><?= $cart->complete_data; ?></td>
             <td><?php
-              if ($cart->payed) {
-                  echo 'Оплачено';
-              } elseif (!App::$cur->money) {
-                  echo 'Не оплачено';
-              } else {
-                  $handlers = App::$cur->ecommerce->getSnippets('payTypeHandler');
-                  $redirect = ['/ecommerce/cart/success'];
-                  if ($cart->payType && !empty($handlers[$cart->payType->handler]['handler'])) {
-                      $newRedirect = $handlers[$cart->payType->handler]['handler']($cart);
-                  }
-                  if (!empty($newRedirect[0])) {
-                      echo '<a class="btn btn-warning btn-sm" href = "' . $newRedirect[0] . '">Оплатить</a>';
-                  } else {
-                      echo 'Не оплачено';
-                  }
-              }
-              ?></td>
+                if ($cart->payed) {
+                    echo 'Оплачено';
+                } elseif (!App::$cur->money) {
+                    echo 'Не оплачено';
+                } else {
+                    $handlers = App::$cur->ecommerce->getSnippets('payTypeHandler');
+                    $redirect = ['/ecommerce/cart/success'];
+                    if ($cart->payType && !empty($handlers[$cart->payType->handler]['handler'])) {
+                        $newRedirect = $handlers[$cart->payType->handler]['handler']($cart);
+                    }
+                    if (!empty($newRedirect[0])) {
+                        echo '<a class="btn btn-warning btn-sm" href = "' . $newRedirect[0] . '">Оплатить</a>';
+                    } else {
+                        echo 'Не оплачено';
+                    }
+                }
+                ?></td>
             <td class="text-right">
               <?php
-              if ($cart->cart_status_id < 2) {
-                  ?>
+                if ($cart->cart_status_id < 2) {
+                    ?>
                   <a title="Продолжить покупки" href="/ecommerce/cart/continue/<?= $cart->id; ?>" data-toggle="tooltip" title="" class="btn btn-success btn-sm"><i class="glyphicon glyphicon-chevron-right"></i></a>
                   <a title="Удалить заказ" onclick="return confirm('Вы уверены?')" href="/ecommerce/cart/delete/<?= $cart->id; ?>" data-toggle="tooltip" title="" class="btn btn-danger btn-sm"><i class="glyphicon glyphicon-trash"></i></a>
                   <?php
-              }
-              if ($cart->cart_status_id >= 2) {
-                  ?>
+                }
+                if ($cart->cart_status_id >= 2) {
+                    ?>
                   <a title="Просмотр" href="/ecommerce/cart/orderDetail/<?= $cart->id; ?>" data-toggle="tooltip" title="" class="btn btn-info btn-sm"><i class="glyphicon glyphicon-eye-open"></i></a>
                   <a title="Заказать повторно" href="/ecommerce/cart/refill/<?= $cart->id; ?>" data-toggle="tooltip" title="" class="btn btn-primary btn-sm"><i class="glyphicon glyphicon-refresh"></i></a>
                     <?php
@@ -108,8 +108,8 @@ 
             </td>
           </tr>
           <?php
-      }
-      ?>
+        }
+        ?>
     </tbody>
   </table>
 </div>