injitools / cms-Inji

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/objects/Florange.php

Braces +12 added lines, -10 removed lines

@@ -40,8 +40,9 @@ 
         $i = 0;
         foreach ($html->find('ul li ul li ul li a') as $element) {
             $item = Item::get(['ci_imported', 'http://florange.ru' . $element->href]);
-            if ($item)
-                continue;
+            if ($item) {
+                            continue;
+            }
 
             $elem = file_get_html('http://florange.ru' . $element->href);
 
@@ -57,10 +58,11 @@ 
             foreach ($elem->find('.description p') as $p) {
                 if ($p->find('strong') && $p->find('strong', 0)->innertext != 'Выберите стиль:') {
                     //$item['head'][] = $p->find('strong', 0)->innertext;
-                } elseif ($p->find('strong') && $p->find('strong', 0)->innertext == 'Выберите стиль:')
-                    break;
-                else
-                    $prices[$i++]['ciprice_about'] = $p->innertext;
+                } elseif ($p->find('strong') && $p->find('strong', 0)->innertext == 'Выберите стиль:') {
+                                    break;
+                } else {
+                                    $prices[$i++]['ciprice_about'] = $p->innertext;
+                }
             }
             $i = 0;
             foreach ($elem->find('.description .tabcontent') as $t) {
@@ -101,12 +103,12 @@ 
             $html = file_get_html('http://florange.ru/production/style/pushup/');
 
             foreach ($html->find('.leftside .nav>li>a') as $element) {
-                if (strpos($element->href, '/style/'))
-                    continue;
+                if (strpos($element->href, '/style/')) {
+                                    continue;
+                }
                 $catalogs[] = ['name' => $element->innertext, 'href' => 'http://florange.ru' . $element->href];
             }
-        }
-        else {
+        } else {
             $html = file_get_html('http://florange.ru/production/style/pushup/');
             $element = $html->find('.leftside .nav>li>a', $parent);
             $html = file_get_html('http://florange.ru' . $element->href);

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>

system/modules/Ecommerce/widgets/filters.php

Indentation +4 added lines, -4 removed lines

@@ -7,8 +7,8 @@ 
         <div class="filter">    
           <h4><?= $option->name; ?></h4>
           <?php
-          foreach ($option->items as $item) {
-              ?>
+            foreach ($option->items as $item) {
+                ?>
 
               <div class="radio">
                 <label>
@@ -18,8 +18,8 @@ 
               </div>
 
               <?php
-          }
-          ?>
+            }
+            ?>
         </div>
         <?php
     }

system/modules/Files/Files.php

Braces +24 added lines, -16 removed lines

@@ -22,16 +22,19 @@ 
 
         $sitePath = App::$primary->path;
 
-        if (!is_uploaded_file($file['tmp_name']))
-            return 0;
+        if (!is_uploaded_file($file['tmp_name'])) {
+                    return 0;
+        }
 
         $fileinfo = pathinfo($file['name']);
-        if (empty($fileinfo['extension']))
-            return 0;
+        if (empty($fileinfo['extension'])) {
+                    return 0;
+        }
 
         $type = Files\Type::get($fileinfo['extension'], 'ext');
-        if (!$type)
-            return 0;
+        if (!$type) {
+                    return 0;
+        }
 
         if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
             return 0;
@@ -47,13 +50,15 @@ 
         }
         $fileObject->name = $fileinfo['filename'];
         $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+                    unlink($sitePath . $fileObject->path);
+        }
 
         Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 
-        if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path))
-            return false;
+        if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path)) {
+                    return false;
+        }
 
         $fileObject->type_id = $type->pk();
         $fileObject->original_name = $file['name'];
@@ -76,12 +81,14 @@ 
         $sitePath = App::$primary->path;
 
         $fileinfo = pathinfo($url);
-        if (empty($fileinfo['extension']))
-            return 0;
+        if (empty($fileinfo['extension'])) {
+                    return 0;
+        }
 
         $type = Files\Type::get($fileinfo['extension'], 'ext');
-        if (!$type)
-            return 0;
+        if (!$type) {
+                    return 0;
+        }
 
         if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
             return 0;
@@ -97,8 +104,9 @@ 
         }
         $fileObject->name = $fileinfo['filename'];
         $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+                    unlink($sitePath . $fileObject->path);
+        }
 
         Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 

system/modules/Libs/Controllers/LibsController.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
         $args = func_get_args();
         $path = $this->module->getPath($args);
         if($path){
-             $this->StaticLoader->giveFile($path);
+                $this->StaticLoader->giveFile($path);
         }
     }
 

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     {
         $args = func_get_args();
         $path = $this->module->getPath($args);
-        if($path){
+        if ($path) {
              $this->StaticLoader->giveFile($path);
         }
     }

system/modules/Libs/Libs.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
                     $this->loadLib($rLib);
                 }
             }
-            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'] )) {
+            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'])) {
                 foreach ($className::$files['css'] as $file) {
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
                         App::$cur->view->customAsset('css', $file, $libName);

system/modules/Materials/Materials.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Materials module
- *
- * @author Alexey Krupskiy <admin@inji.ru>
- * @link http://inji.ru/
- * @copyright 2015 Alexey Krupskiy
- * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
- */
+     * Materials module
+     *
+     * @author Alexey Krupskiy <admin@inji.ru>
+     * @link http://inji.ru/
+     * @copyright 2015 Alexey Krupskiy
+     * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
+     */
 class Materials extends Module
 {
     function viewsList()