injitools / cms-Inji

system/modules/Ecommerce/Ecommerce.php

Braces +12 added lines, -6 removed lines

@@ -86,7 +86,8 @@ 
                         $user->{$path[0]}->{$path[1]} = $info->value;
                         $relations[$path[0]] = $path[0];
                     }
-                } else {
+                }
+                else {
                     if (!$user->{$field->userfield}) {
                         $user->{$field->userfield} = $info->value;
                     }
@@ -142,7 +143,8 @@ 
                         $user->{$path[0]}->{$path[1]} = $info->value;
                         $relations[$path[0]] = $path[0];
                     }
-                } else {
+                }
+                else {
                     if (!$user->{$field->userfield}) {
                         $user->{$field->userfield} = $info->value;
                     }
@@ -262,7 +264,8 @@ 
                                     $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                                 }
                                 $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
-                            } else {
+                            }
+                            else {
                                 $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
                             }
                             $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
@@ -281,7 +284,8 @@ 
                                     $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                                 }
                                 $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
-                            } else {
+                            }
+                            else {
                                 $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
                             }
                             $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index() . ' = ' . 'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer::index() . ' AND ' .
@@ -306,7 +310,8 @@ 
                 $first = false;
             }
             $selectOptions['where'][] = $where;
-        } elseif (!empty($options['parent'])) {
+        }
+        elseif (!empty($options['parent'])) {
             $category = \Ecommerce\Category::get($options['parent']);
             $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
         }
@@ -492,7 +497,8 @@ 
             foreach ($cartItem->price->offer->bonuses as $bonus) {
                 if ($bonus->limited && $bonus->left <= 0) {
                     continue;
-                } elseif ($bonus->limited && $bonus->left > 0) {
+                }
+                elseif ($bonus->limited && $bonus->left > 0) {
                     $bonus->left -= 1;
                     $bonus->save();
                 }

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

Braces +8 added lines, -4 removed lines

@@ -17,14 +17,16 @@ 
         if (!$this->id) {
             $event = new Event(['cart_id' => $this->cart_id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 1, 'info' => $this->item_offer_price_id]);
             $event->save();
-        } else {
+        }
+        else {
             $cur = Item::get($this->id);
             if ($cur->item_id != $this->item_id) {
                 $event = new Event(['cart_id' => $this->cart->cart_id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 2, 'info' => $cur->item_offer_price_id]);
                 $event->save();
                 $event = new Event(['cart_id' => $this->cart->cart_id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 1, 'info' => $this->item_offer_price_id]);
                 $event->save();
-            } else {
+            }
+            else {
                 if ($cur->item_offer_price_id != $this->item_offer_price_id) {
                     $event = new Event(['cart_id' => $this->cart->cart_id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 3, 'info' => $this->item_offer_price_id]);
                     $event->save();
@@ -56,14 +58,16 @@ 
             if ($block) {
                 $block->count = $this->count;
                 $block->save();
-            } else {
+            }
+            else {
                 $block = new \Ecommerce\Warehouse\Block();
                 $block->item_offer_id = $this->price->item_offer_id;
                 $block->cart_id = $this->cart_id;
                 $block->count = $this->count;
                 $block->save();
             }
-        } elseif ($block) {
+        }
+        elseif ($block) {
             $block->delete();
         }
         $this->cart->checkStage();

system/modules/Ecommerce/models/Cart.php

Braces +4 added lines, -2 removed lines

@@ -313,7 +313,8 @@ 
             $deliveryPrice = new \Money\Sums([$this->delivery->currency_id => $this->delivery->max_cart_price]);
             if ($this->delivery->max_cart_price && $sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) {
                 $sum->sums = [$this->delivery->currency_id => 0];
-            } else if ($this->delivery->prices) {
+            }
+            else if ($this->delivery->prices) {
                 foreach ($this->delivery->prices(['order' => ['cart_price', 'asc']]) as $delPrice) {
                     $deliveryPrice = new \Money\Sums([$delPrice->currency_id => $delPrice->cart_price]);
                     if ($sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) {
@@ -323,7 +324,8 @@ 
                 if (!$sum->sums) {
                     $sum->sums = [$this->delivery->currency_id => $this->delivery->price];
                 }
-            } else {
+            }
+            else {
                 $sum->sums = [$this->delivery->currency_id => $this->delivery->price];
             }
         }

system/modules/Ecommerce/models/Item.php

Braces +6 added lines, -3 removed lines

@@ -234,7 +234,8 @@ 
                     if ($option->item_option_searchable && $option->value) {
                         if ($option->item_option_type != 'select') {
                             $this->search_index .= $option->value . ' ';
-                        } elseif (!empty($option->option->items[$option->value])) {
+                        }
+                        elseif (!empty($option->option->items[$option->value])) {
                             $option->option->items[$option->value]->value . ' ';
                         }
                     }
@@ -247,7 +248,8 @@ 
                             if ($option->item_offer_option_searchable && $option->value) {
                                 if ($option->item_offer_option_type != 'select') {
                                     $this->search_index .= $option->value . ' ';
-                                } elseif (!empty($option->option->items[$option->value])) {
+                                }
+                                elseif (!empty($option->option->items[$option->value])) {
                                     $option->option->items[$option->value]->value . ' ';
                                 }
                             }
@@ -305,7 +307,8 @@ 
         foreach ($offers[0]->prices as $price) {
             if (!$price->type) {
                 $curPrice = $price;
-            } elseif (
+            }
+            elseif (
                     (!$price->type->roles && !$curPrice) ||
                     ($price->type->roles && !$curPrice && strpos($price->type->roles, "|" . \Users\User::$cur->role_id . "|") !== false)
             ) {

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

Braces +2 added lines, -1 removed lines

@@ -94,7 +94,8 @@
     public function value($default = '') {
         if ($this->option->type != 'select') {
             return $this->value;
-        } elseif ($this->optionItem) {
+        }
+        elseif ($this->optionItem) {
             return $this->optionItem->value;
         }
         return $default;

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

Braces +24 added lines, -12 removed lines

@@ -71,7 +71,8 @@ 
                       $itemName = $item->name();
                       if (!isset($sums[$cartItem->price->currency_id])) {
                           $sums[$cartItem->price->currency_id] = $cartItem->price->price;
-                      } else {
+                      }
+                      else {
                           $sums[$cartItem->price->currency_id] += $cartItem->price->price;
                       }
                       ?>
@@ -84,10 +85,12 @@ 
                                   $currency = Money\Currency::get($cartItem->price->currency_id);
                                   if ($currency) {
                                       echo $currency->acronym();
-                                  } else {
+                                  }
+                                  else {
                                       echo 'руб.';
                                   }
-                              } else {
+                              }
+                              else {
                                   echo 'руб.';
                               }
                               ?></td>
@@ -97,10 +100,12 @@ 
                                   $currency = Money\Currency::get($cartItem->price->currency_id);
                                   if ($currency) {
                                       echo $currency->acronym();
-                                  } else {
+                                  }
+                                  else {
                                       echo 'руб.';
                                   }
-                              } else {
+                              }
+                              else {
                                   echo 'руб.';
                               }
                               ?></td>
@@ -126,10 +131,12 @@ 
                                   $currency = Money\Currency::get($currency_id);
                                   if ($currency) {
                                       echo '&nbsp;' . $currency->acronym();
-                                  } else {
+                                  }
+                                  else {
                                       echo '&nbsp;руб.';
                                   }
-                              } else {
+                              }
+                              else {
                                   echo '&nbsp;руб.';
                               }
                               echo '<br />';
@@ -142,7 +149,8 @@ 
                     $deliveryPrice = $cart->delivery->price;
                     if (!isset($sums[$deliveryCurrency])) {
                         $sums[$deliveryCurrency] = $deliveryPrice;
-                    } else {
+                    }
+                    else {
                         $sums[$deliveryCurrency] += $deliveryPrice;
                     }
                     $delCurrency = false;
@@ -169,10 +177,12 @@ 
                                   $currency = Money\Currency::get($currency_id);
                                   if ($currency) {
                                       echo '&nbsp;' . $currency->acronym();
-                                  } else {
+                                  }
+                                  else {
                                       echo '&nbsp;руб.';
                                   }
-                              } else {
+                              }
+                              else {
                                   echo '&nbsp;руб.';
                               }
                               echo '<br />';
@@ -208,7 +218,8 @@ 
                                     $price = Ecommerce\Item\Offer\Price::get($status->info);
                                     if ($price) {
                                         echo "<a href = '/ecommerce/view/{$item->id}'>" . $price->offer->item->name() . "</a>";
-                                    } else {
+                                    }
+                                    else {
                                         echo 'Товар удален';
                                     }
                                     break;
@@ -217,7 +228,8 @@ 
                                     $price = Ecommerce\Item\Offer\Price::get($info[0]);
                                     if ($price) {
                                         echo "<a href = '/ecommerce/view/{$item->id}'>" . $price->offer->item->name() . "</a> " . ($info[1] > 0 ? '+' . $info[1] : $info[1]);
-                                    } else {
+                                    }
+                                    else {
                                         echo 'Товар удален';
                                     }
                                     break;

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

Braces +7 added lines, -4 removed lines

@@ -3,8 +3,9 @@ 
         <div class="cart-order_page">
             <h2>Быстрое оформление заказа</h2>
             <?php
-            if (!$cart || !$cart->cartItems)
-                echo "<h1>Ваша корзина пуста</h1>";
+            if (!$cart || !$cart->cartItems) {
+                            echo "<h1>Ваша корзина пуста</h1>";
+            }
             else {
                 $form = new Ui\Form;
                 $form->action = "/ecommerce/cart";
@@ -88,7 +89,8 @@ 
                                       <?php
                                       if (class_exists('Money\Currency')) {
                                           $defaultCurrency = Money\Currency::get(\App::$cur->ecommerce->config['defaultCurrency']);
-                                      } else {
+                                      }
+                                      else {
                                           $defaultCurrency = '';
                                       }
                                       foreach ($cart->cartItems as $cartItem) {
@@ -146,7 +148,8 @@ 
                                                 <td colspan="2" class="text-right"><?php
                                                   if ($cart->delivery && $cart->delivery->price_text) {
                                                       echo $cart->delivery->price_text;
-                                                  } else {
+                                                  }
+                                                  else {
                                                       echo $cart->deliverySum();
                                                   }
                                                   ?></td>

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

Braces +8 added lines, -5 removed lines

@@ -18,13 +18,16 @@
                         <ul class="item-options">
                           <?php
                           foreach ($item->options as $param) {
-                              if (!$param->item_option_view || !$param->value)
-                                  continue;
+                              if (!$param->item_option_view || !$param->value) {
+                                                                continue;
+                              }
                               if ($param->item_option_type == 'select') {
-                                  if (empty($param->option->items[$param->value]))
-                                      continue;
+                                  if (empty($param->option->items[$param->value])) {
+                                                                        continue;
+                                  }
                                   $value = $param->option->items[$param->value]->value;
-                              } else {
+                              }
+                              else {
                                   $value = $param->value;
                               }
                               $paramName = $param->item_option_name;

system/modules/Ecommerce/appControllers/EcommerceController.php

Braces +20 added lines, -10 removed lines

@@ -28,7 +28,8 @@ 
                 if (!$user_id) {
                     $error = true;
                     $user = null;
-                } else {
+                }
+                else {
                     $user = Users\User::get($user_id);
                 }
             }
@@ -107,16 +108,19 @@ 
                 $category_id = (int) $_GET['inCatalog'];
             }
             $search = $_GET['search'];
-        } else {
+        }
+        else {
             $search = '';
         }
 
         //sort
         if (!empty($_GET['sort'])) {
             $sort = $_GET['sort'];
-        } elseif (!empty($this->ecommerce->config['defaultSort'])) {
+        }
+        elseif (!empty($this->ecommerce->config['defaultSort'])) {
             $sort = $this->ecommerce->config['defaultSort'];
-        } else {
+        }
+        else {
             $sort = ['name' => 'asc'];
         }
 
@@ -131,10 +135,12 @@ 
             }
             if ($category) {
                 $category_id = $category->id;
-            } else {
+            }
+            else {
                 $category_id = 0;
             }
-        } else {
+        }
+        else {
             $category_id = 0;
         }
         $active = $category_id;
@@ -153,7 +159,8 @@ 
         if (!$category || !$category->name) {
             $bread[] = array('text' => 'Каталог');
             $this->view->setTitle('Каталог');
-        } else {
+        }
+        else {
             $bread[] = array('text' => 'Каталог', 'href' => '/ecommerce');
             $categoryIds = array_values(array_filter(explode('/', $category->tree_path)));
             foreach ($categoryIds as $id) {
@@ -177,7 +184,8 @@ 
         //params 
         if (empty(App::$cur->ecommerce->config['filtersInLast'])) {
             $options = \Ecommerce\Item\Option::getList(['where' => ['item_option_searchable', 1], 'order' => ['weight', 'asc']]);
-        } else {
+        }
+        else {
             $params = $this->ecommerce->getItemsParams([
                 'parent' => $category_id,
                 'search' => trim($search),
@@ -189,7 +197,8 @@ 
             }
             if ($ids) {
                 $options = \Ecommerce\Item\Option::getList(['where' => ['id', $ids, 'IN'], 'order' => ['weight', 'asc']]);
-            } else {
+            }
+            else {
                 $options = [];
             }
         }
@@ -198,7 +207,8 @@ 
         //child categorys
         if ($category) {
             $categorys = $category->catalogs;
-        } else {
+        }
+        else {
             $categorys = \Ecommerce\Category::getList(['where' => ['parent_id', 0]]);
         }