injitools / cms-Inji

system/modules/Users/appControllers/content/cabinet.php

Indentation +12 added lines, -12 removed lines

@@ -26,20 +26,20 @@
         </div>
         <div class="col-sm-9">
           <?php
-          if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) {
-              foreach ($sections as $section) {
-                  if (!empty($section['smallWidget'])) {
-                      $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget'];
-                      $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1;
-                      ?>
+            if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) {
+                foreach ($sections as $section) {
+                    if (!empty($section['smallWidget'])) {
+                        $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget'];
+                        $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1;
+                        ?>
                       <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $this->widget($widgetName); ?></div>
                       <?php
-                  }
-              }
-          } else {
-              $this->widget($sections[$activeSection]['fullWidget']);
-          }
-          ?>
+                    }
+                }
+            } else {
+                $this->widget($sections[$activeSection]['fullWidget']);
+            }
+            ?>
         </div>
       </div>
     </div>

system/modules/Money/appControllers/content/pay.php

Indentation +14 added lines, -14 removed lines

@@ -10,12 +10,12 @@ 
         <th></th>
       </tr>
       <?php
-      foreach ($merchants as $merchant) {
-          $allowCurrencies = $merchant->allowCurrencies($pay);
-          if (!$allowCurrencies) {
-              continue;
-          }
-          ?>
+        foreach ($merchants as $merchant) {
+            $allowCurrencies = $merchant->allowCurrencies($pay);
+            if (!$allowCurrencies) {
+                continue;
+            }
+            ?>
           <tr>
             <td>
               <img src="<?= Statics::file($merchant->image ? $merchant->image->path : '/static/system/images/no-image.png', '150x150'); ?>" class="img-responsive" />
@@ -23,23 +23,23 @@ 
             </td>
             <td>
               <?php
-              foreach ($allowCurrencies as $allowCurrency) {
-                  $className = 'Money\MerchantHelper\\' . $merchant->object_name;
-                  $sum = $className::getFinalSum($pay, $allowCurrency);
-                  ?>
+                foreach ($allowCurrencies as $allowCurrency) {
+                    $className = 'Money\MerchantHelper\\' . $merchant->object_name;
+                    $sum = $className::getFinalSum($pay, $allowCurrency);
+                    ?>
                   <b><?= $allowCurrency['currency']->name(); ?></b>
                   <a class="btn btn-primary" href ="/money/merchants/go/<?= $pay->id; ?>/<?= $merchant->id; ?>/<?= $allowCurrency['currency']->id; ?>">Оплатить <?= $sum; ?> <?= $allowCurrency['currency']->acronym(); ?></a>
                   <?php
-              }
-              ?>
+                }
+                ?>
             </td>
             <td width="100%">
               <?= $merchant->previewImage ? '<img src="' . $merchant->previewImage->path . '" class="img-responsive" />' : ''; ?>
             </td>
           </tr>
           <?php
-      }
-      ?>
+        }
+        ?>
     </table>
   </div>
 </div>
\ No newline at end of file

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

Indentation +143 added lines, -143 removed lines

@@ -3,33 +3,33 @@ 
     <div class="cart-order_page">
       <h2>Быстрое оформление заказа</h2>
       <?php
-      if (!$cart || !$cart->cartItems)
-          echo "<h1>Ваша корзина пуста</h1>";
-      else {
-          $sums = [];
-          $cartDelivery = $cart->delivery;
-          $deliveryPrice = 0;
-          $deliveryCurrency = 0;
-          if (!$cartDelivery) {
-              $cartDelivery = current($deliverys);
-          }
-          if ($cartDelivery) {
-              if ($cartDelivery->max_cart_price) {
-                  $deliveryPrice = (($cart->sum >= $cartDelivery->max_cart_price) ? '0' : $cartDelivery->price);
-              } else {
-                  $deliveryPrice = $cartDelivery->price;
-              }
-              $deliveryCurrency = $cartDelivery->currency_id;
-          }
-          $cartPayType = $cart->payType;
-          if (!$cartPayType) {
-              $cartPayType = current($payTypes);
-          }
+        if (!$cart || !$cart->cartItems)
+            echo "<h1>Ваша корзина пуста</h1>";
+        else {
+            $sums = [];
+            $cartDelivery = $cart->delivery;
+            $deliveryPrice = 0;
+            $deliveryCurrency = 0;
+            if (!$cartDelivery) {
+                $cartDelivery = current($deliverys);
+            }
+            if ($cartDelivery) {
+                if ($cartDelivery->max_cart_price) {
+                    $deliveryPrice = (($cart->sum >= $cartDelivery->max_cart_price) ? '0' : $cartDelivery->price);
+                } else {
+                    $deliveryPrice = $cartDelivery->price;
+                }
+                $deliveryCurrency = $cartDelivery->currency_id;
+            }
+            $cartPayType = $cart->payType;
+            if (!$cartPayType) {
+                $cartPayType = current($payTypes);
+            }
 
-          $form = new Ui\Form;
-          $form->action = "/ecommerce/cart";
-          $form->begin();
-          ?>
+            $form = new Ui\Form;
+            $form->action = "/ecommerce/cart";
+            $form->begin();
+            ?>
           <div class="row">
             <div class="col-sm-4">
               <div class="order_page-info">
@@ -139,8 +139,8 @@ 
                         <div class="col-md-8">
                           <h4>Информация об оплате</h4>
                           <?php
-                          echo $cartPayType->info;
-                          ?> 
+                            echo $cartPayType->info;
+                            ?> 
                         </div>
                       </div>
                     </div>
@@ -167,23 +167,23 @@ 
                     </thead>
                     <tbody>
                       <?php
-                      if (class_exists('Money\Currency')) {
-                          $defaultCurrency = Money\Currency::get(\App::$cur->ecommerce->config['defaultCurrency']);
-                      } else {
-                          $defaultCurrency = '';
-                      }
-                      $discountSum = 0;
-                      foreach ($cart->cartItems as $cartItem) {
-                          $path = $cartItem->item->image ? $cartItem->item->image->path : '/static/system/images/no-image.png';
-                          $discount = $cartItem->discount();
-                          $discountSum += $discount;
-                          $itemName = $cartItem->item->name();
-                          if (!isset($sums[$cartItem->price->currency_id])) {
-                              $sums[$cartItem->price->currency_id] = $cartItem->price->price * $cartItem->count;
-                          } else {
-                              $sums[$cartItem->price->currency_id] += $cartItem->price->price * $cartItem->count;
-                          }
-                          ?>
+                        if (class_exists('Money\Currency')) {
+                            $defaultCurrency = Money\Currency::get(\App::$cur->ecommerce->config['defaultCurrency']);
+                        } else {
+                            $defaultCurrency = '';
+                        }
+                        $discountSum = 0;
+                        foreach ($cart->cartItems as $cartItem) {
+                            $path = $cartItem->item->image ? $cartItem->item->image->path : '/static/system/images/no-image.png';
+                            $discount = $cartItem->discount();
+                            $discountSum += $discount;
+                            $itemName = $cartItem->item->name();
+                            if (!isset($sums[$cartItem->price->currency_id])) {
+                                $sums[$cartItem->price->currency_id] = $cartItem->price->price * $cartItem->count;
+                            } else {
+                                $sums[$cartItem->price->currency_id] += $cartItem->price->price * $cartItem->count;
+                            }
+                            ?>
                           <tr class="cart_item_id<?= $cartItem->id; ?> item" data-cart_item_id = '<?php echo $cartItem->id; ?>' data-priceam = '<?php echo $cartItem->price->price; ?>' data-item_offer_price_id = '<?php echo $cartItem->price->id; ?>'>
                             <td class="text-center image">                            
                               <a href="/ecommerce/view/<?php echo $cartItem->item->id; ?>">
@@ -195,24 +195,24 @@ 
                             </td>
                             <td class="text-left quantity">
                               <?php
-                              $options = $cartItem->item->options(['key' => 'item_option_id']);
-                              $price = $cartItem->item->getPrice();
-                              if (empty(App::$cur->ecommerce->config['sell_over_warehouse'])) {
-                                  $max = $price->offer->warehouseCount((!empty($_SESSION['cart']['cart_id']) ? $_SESSION['cart']['cart_id'] : 0));
-                              } else {
-                                  $max = 100;
-                              }
-                              if (!empty($options[16]) && $options[16]->value) {
-                                  echo '<div style="min-width:200px;">';
-                                  $price = $cartItem->price;
-                                  $step = preg_replace('![^0-9]!', '', $options[16]->value) / 1000;
-                                  ?>
+                                $options = $cartItem->item->options(['key' => 'item_option_id']);
+                                $price = $cartItem->item->getPrice();
+                                if (empty(App::$cur->ecommerce->config['sell_over_warehouse'])) {
+                                    $max = $price->offer->warehouseCount((!empty($_SESSION['cart']['cart_id']) ? $_SESSION['cart']['cart_id'] : 0));
+                                } else {
+                                    $max = 100;
+                                }
+                                if (!empty($options[16]) && $options[16]->value) {
+                                    echo '<div style="min-width:200px;">';
+                                    $price = $cartItem->price;
+                                    $step = preg_replace('![^0-9]!', '', $options[16]->value) / 1000;
+                                    ?>
                                   Примерный вес
                                   <input type = "text" data-miltiple="1000" class ="combineRanger item-counter" data-step ="<?= $step; ?>" data-max="<?= $max; ?>" data-price ="<?= $price->price; ?>" name="cartItems[<?php echo $cartItem->id; ?>]" value ="<?= $cartItem->count; ?>" />
                                   <?php
-                                  echo '</div>';
-                              } else {
-                                  ?>
+                                    echo '</div>';
+                                } else {
+                                    ?>
                                   <div class="input-group number-spinner" >
                                     <span class="input-group-btn">
                                       <button type="button" class="btn btn-default btn-sm btn-number" data-type="minus" data-field="cartItems[<?php echo $cartItem->id; ?>]"><span class="glyphicon glyphicon-minus"></span></button>
@@ -223,8 +223,8 @@ 
                                     </span>
                                   </div>
                                   <?php
-                              }
-                              ?>
+                                }
+                                ?>
 
                             </td>
                             <td class="text-right price"><?= number_format($cartItem->price->price, 2, '.', '&nbsp;'); ?>&nbsp;<?= $cartItem->price->currency ? $cartItem->price->currency->acronym() : ($defaultCurrency ? $defaultCurrency->acronym() : 'Руб.'); ?></td>
@@ -240,109 +240,109 @@ 
                             </td>
                           </tr>
                           <?php
-                      }
-                      ?>
+                        }
+                        ?>
                       </tr>
                     </tbody>
                     <tfoot>
                       <?php
-                      $colspan = $cart->card ? 5 : 4;
-                      ?>
+                        $colspan = $cart->card ? 5 : 4;
+                        ?>
                       <tr class="order_page-sum">
                         <td colspan="<?= $colspan; ?>" class="text-right">Сумма:</td>
                         <td colspan="2" 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>
                       </tr>
                       <?php
-                      if ($cartDelivery) {
-                          ?>
+                        if ($cartDelivery) {
+                            ?>
                           <tr class="order_page-deliverySum">
                             <td colspan="<?= $colspan; ?>" class="text-right"><?= $cartDelivery->name; ?>:</td>
                             <td colspan="2" class="text-right"><?php
-                              if ($cartDelivery && $cartDelivery->price_text) {
-                                  echo $cartDelivery->price_text;
-                              } else {
-                                  echo number_format($deliveryPrice, 2, '.', ' ');
-                                  if ($deliveryCurrency && App::$cur->money) {
-                                      $currency = Money\Currency::get($deliveryCurrency);
-                                      if ($currency) {
-                                          echo '&nbsp;' . $currency->acronym();
-                                      } else {
-                                          echo '&nbsp;руб.';
-                                      }
-                                  } else {
-                                      echo '&nbsp;руб.';
-                                  }
-                              }
-                              ?></td>
+                                if ($cartDelivery && $cartDelivery->price_text) {
+                                    echo $cartDelivery->price_text;
+                                } else {
+                                    echo number_format($deliveryPrice, 2, '.', ' ');
+                                    if ($deliveryCurrency && App::$cur->money) {
+                                        $currency = Money\Currency::get($deliveryCurrency);
+                                        if ($currency) {
+                                            echo '&nbsp;' . $currency->acronym();
+                                        } else {
+                                            echo '&nbsp;руб.';
+                                        }
+                                    } else {
+                                        echo '&nbsp;руб.';
+                                    }
+                                }
+                                ?></td>
                           </tr>
                           <?php
-                      }
-                      if ($packItem) {
-                          if ($packchecked) {
-                              $packSum = ceil(($cart->sum + $deliveryPrice) / 1000) * (float) $packItem->price->price;
-                          } else {
-                              $packSum = 0;
-                          }
-                          ?>
+                        }
+                        if ($packItem) {
+                            if ($packchecked) {
+                                $packSum = ceil(($cart->sum + $deliveryPrice) / 1000) * (float) $packItem->price->price;
+                            } else {
+                                $packSum = 0;
+                            }
+                            ?>
                           <tr class="order_page-packSum">
                             <td colspan="<?= $colspan; ?>" class="text-right">Пакеты:</td>
                             <td colspan="2" class="text-right"><?= number_format($packSum, 2, '.', ' '); ?>&nbsp;руб.</td>
                           </tr>
                           <?php
-                      }
-                      if ($cart->card) {
-                          ?>
+                        }
+                        if ($cart->card) {
+                            ?>
                           <tr class="order_page-discountSum">
                             <td colspan="<?= $colspan; ?>" class="text-right">Скидка:</td>
                             <td colspan="2" class="text-right"><?= number_format($discountSum, 2, '.', ' '); ?>&nbsp;руб.</td>
                           </tr>
                           <?php
-                      }
-                      if (!isset($sums[$deliveryCurrency])) {
-                          $sums[$deliveryCurrency] = $deliveryPrice;
-                      } else {
-                          $sums[$deliveryCurrency] += $deliveryPrice;
-                      }
-                      ?>
+                        }
+                        if (!isset($sums[$deliveryCurrency])) {
+                            $sums[$deliveryCurrency] = $deliveryPrice;
+                        } else {
+                            $sums[$deliveryCurrency] += $deliveryPrice;
+                        }
+                        ?>
                       <tr class="order_page-total">
                         <td colspan="<?= $colspan; ?>" class="text-right">Итого:</td>
                         <td colspan="2" 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>
                       </tr>
                     </tfoot>
                   </table>
@@ -352,8 +352,8 @@ 
                 <div class="clearfix"></div>
                 <div class="order_page-finish">
                   <?php
-                  $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']);
-                  ?>
+                    $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']);
+                    ?>
                   <div class="order_page-orderBtn">
                     <button name ="action" value ="order" data-loading-text="Подождите.." class="btn btn-primary">Подтверждение заказа</button>
                   </div>
@@ -363,9 +363,9 @@ 
           </div>
 
           <?php
-          $form->end(false);
-      }
-      ?>
+            $form->end(false);
+        }
+        ?>
     </div>
   </div>
 </div>
\ No newline at end of file

system/modules/Materials/appControllers/content/category.php

Indentation +6 added lines, -6 removed lines

@@ -2,10 +2,10 @@ 
   <div class="row">
     <div class="col-md-3">
       <?php
-      \Ui\Tree::ul($category->getRoot(), 0, function($category) {
-          echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
-      });
-      ?>
+        \Ui\Tree::ul($category->getRoot(), 0, function($category) {
+            echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
+        });
+        ?>
     </div>
     <div class="col-md-9">
       <div class="content">
@@ -34,8 +34,8 @@ 
             ?>
           </div>
           <?php
-          $pages->draw();
-          ?>
+            $pages->draw();
+            ?>
         </div>
       </div>
     </div>

system/modules/Materials/appControllers/content/materialWithCategorys.php

Indentation +5 added lines, -5 removed lines

@@ -2,11 +2,11 @@
   <div class="row">
     <div class="col-md-3">
       <?php
-      $category = $material->category;
-      \Ui\Tree::ul($category->getRoot(), 0, function($category) {
-          echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
-      });
-      ?>
+        $category = $material->category;
+        \Ui\Tree::ul($category->getRoot(), 0, function($category) {
+            echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
+        });
+        ?>
     </div>
     <div class="col-md-9">
       <div class="content">