Merge branch 'develop'

bereznii · Jul 28, 2020 · 4db34a2 · 4db34a2
2 parents 73c3dbe + 8b06ad8
commit 4db34a2
Show file tree

Hide file tree

Showing 174 changed files with 52,324 additions and 1,818 deletions.
diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
diff --git a/_ide_helper.php b/_ide_helper.php
diff --git a/_ide_helper_models.php b/_ide_helper_models.php
@@ -12,7 +12,7 @@
 
 namespace App{
 /**
- * App\User
+ * App\Entities\User
  *
  * @property int $id
  * @property string $name

diff --git a/app/Console/Commands/formatModelsNames.php b/app/Console/Commands/formatModelsNames.php
@@ -80,5 +80,7 @@ public function handle()
             }
 
         }
+
+        return 0;
     }
 }
diff --git a/app/Entities/CallbackRequest.php b/app/Entities/CallbackRequest.php
@@ -6,8 +6,26 @@
 
 /**
  * Class CallbackRequest
+ *
  * @package App\Entities
  * @mixin \Eloquent
+ * @property int $id
+ * @property string|null $name
+ * @property string|null $phone
+ * @property string|null $comment
+ * @property int $is_called
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\CallbackRequest newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\CallbackRequest newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\CallbackRequest query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\CallbackRequest whereComment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\CallbackRequest whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\CallbackRequest whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\CallbackRequest whereIsCalled($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\CallbackRequest whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\CallbackRequest wherePhone($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\CallbackRequest whereUpdatedAt($value)
  */
 class CallbackRequest extends Model
 {

diff --git a/app/Entities/Make.php b/app/Entities/Make.php
@@ -6,8 +6,16 @@
 
 /**
  * Class Make
+ *
  * @package App\Entities
  * @mixin \Eloquent
+ * @property int $id
+ * @property string $name
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Make newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Make newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Make query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Make whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Make whereName($value)
  */
 class Make extends Model
 {

diff --git a/app/Entities/MakeModel.php b/app/Entities/MakeModel.php
@@ -6,8 +6,19 @@
 
 /**
  * Class MakeModel
+ *
  * @package App\Entities
  * @mixin \Eloquent
+ * @property int $id
+ * @property int $make_id
+ * @property string $name
+ * @property-read \App\Entities\ModelsNameOptions $modelNameOption
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\MakeModel newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\MakeModel newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\MakeModel query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\MakeModel whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\MakeModel whereMakeId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\MakeModel whereName($value)
  */
 class MakeModel extends Model
 {

diff --git a/app/Entities/ManufacturerCharge.php b/app/Entities/ManufacturerCharge.php
@@ -4,6 +4,24 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Entities\ManufacturerCharge
+ *
+ * @property int $id
+ * @property string $name
+ * @property float|null $charge
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ManufacturerCharge newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ManufacturerCharge newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ManufacturerCharge query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ManufacturerCharge whereCharge($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ManufacturerCharge whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ManufacturerCharge whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ManufacturerCharge whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ManufacturerCharge whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class ManufacturerCharge extends Model
 {
     protected $table = 'manufacturer_charge';

diff --git a/app/Entities/ModelsNameOptions.php b/app/Entities/ModelsNameOptions.php
@@ -4,6 +4,33 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Entities\ModelsNameOptions
+ *
+ * @property int $id
+ * @property int $model_id
+ * @property string|null $model_name
+ * @property string|null $model_years
+ * @property string|null $model_body
+ * @property string|null $cyrillic_name
+ * @property int $is_user_edit
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Entities\MakeModel $model
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ModelsNameOptions newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ModelsNameOptions newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ModelsNameOptions query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ModelsNameOptions whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ModelsNameOptions whereCyrillicName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ModelsNameOptions whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ModelsNameOptions whereIsUserEdit($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ModelsNameOptions whereModelBody($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ModelsNameOptions whereModelId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ModelsNameOptions whereModelName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ModelsNameOptions whereModelYears($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\ModelsNameOptions whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class ModelsNameOptions extends Model
 {
     /**

diff --git a/app/Entities/Order.php b/app/Entities/Order.php
@@ -6,8 +6,46 @@
 
 /**
  * Class Order
+ *
  * @package App\Entities
  * @mixin \Eloquent
+ * @property int $id
+ * @property string $name
+ * @property string $surname
+ * @property string $email
+ * @property string $phone
+ * @property string $address
+ * @property string $country
+ * @property string $city
+ * @property string|null $comment
+ * @property int $need_callback
+ * @property int $delivery_type_id
+ * @property int $payment_type_id
+ * @property int $status_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read string $status_name
+ * @property-read string $total_price
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Entities\Product[] $products
+ * @property-read int|null $products_count
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order whereAddress($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order whereCity($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order whereComment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order whereCountry($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order whereDeliveryTypeId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order whereEmail($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order whereNeedCallback($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order wherePaymentTypeId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order wherePhone($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order whereStatusId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order whereSurname($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Order whereUpdatedAt($value)
  */
 class Order extends Model
 {

diff --git a/app/Entities/OrderProduct.php b/app/Entities/OrderProduct.php
@@ -4,6 +4,28 @@
 
 use Illuminate\Database\Eloquent\Relations\Pivot;
 
+/**
+ * App\Entities\OrderProduct
+ *
+ * @property int $id
+ * @property int $order_id
+ * @property int $product_id
+ * @property int $quantity
+ * @property float $price
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\OrderProduct newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\OrderProduct newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\OrderProduct query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\OrderProduct whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\OrderProduct whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\OrderProduct whereOrderId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\OrderProduct wherePrice($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\OrderProduct whereProductId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\OrderProduct whereQuantity($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\OrderProduct whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class OrderProduct extends Pivot
 {
     protected $table = 'order_product';

diff --git a/app/Entities/Product.php b/app/Entities/Product.php
@@ -7,8 +7,54 @@
 
 /**
  * Class Product
+ *
  * @package App\Entities
  * @mixin \Eloquent
+ * @property int $id
+ * @property int $make_id
+ * @property int $model_id
+ * @property int $type_id
+ * @property string $barcode
+ * @property string $stock_code
+ * @property string $nomenclature
+ * @property string|null $original_description
+ * @property string|null $detailed_description
+ * @property string|null $translated_description
+ * @property int $in_stock
+ * @property float $dealer_price
+ * @property float $retail_price
+ * @property string $manufacture
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property string|null $original_code
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \App\Entities\Make $make
+ * @property-read \App\Entities\MakeModel $model
+ * @property-read \App\Entities\Type|null $type
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product newQuery()
+ * @method static \Illuminate\Database\Query\Builder|\App\Entities\Product onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereBarcode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereDealerPrice($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereDetailedDescription($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereInStock($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereMakeId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereManufacture($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereModelId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereNomenclature($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereOriginalCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereOriginalDescription($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereRetailPrice($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereStockCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereTranslatedDescription($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereTypeId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Product whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\App\Entities\Product withTrashed()
+ * @method static \Illuminate\Database\Query\Builder|\App\Entities\Product withoutTrashed()
  */
 class Product extends Model
 {

diff --git a/app/Entities/Shortcut.php b/app/Entities/Shortcut.php
@@ -4,6 +4,20 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Entities\Shortcut
+ *
+ * @property int $id
+ * @property string $shortcut
+ * @property string $meaning
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Shortcut newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Shortcut newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Shortcut query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Shortcut whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Shortcut whereMeaning($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Shortcut whereShortcut($value)
+ * @mixin \Eloquent
+ */
 class Shortcut extends Model
 {
     public $timestamps = false;

diff --git a/app/Entities/Test.php b/app/Entities/Test.php
@@ -4,6 +4,14 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Entities\Test
+ *
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Test newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Test newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Test query()
+ * @mixin \Eloquent
+ */
 class Test extends Model
 {
     protected $table = 'tests';

diff --git a/app/Entities/Type.php b/app/Entities/Type.php
@@ -6,8 +6,19 @@
 
 /**
  * Class Type
+ * 
+ * Entities * @mixin \Eloquent
  *
-Entities * @mixin \Eloquent
+ * @property int $id
+ * @property string $code
+ * @property string $translation
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Type newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Type newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Type query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Type whereCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Type whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\Type whereTranslation($value)
+ * @mixin \Eloquent
  */
 class Type extends Model
 {

diff --git a/app/Entities/User.php b/app/Entities/User.php
@@ -1,10 +1,36 @@
 <?php
 
-namespace App;
+namespace App\Entities;
 
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 
+/**
+ * App\Entities\User
+ *
+ * @property int $id
+ * @property string $name
+ * @property string $email
+ * @property \Illuminate\Support\Carbon|null $email_verified_at
+ * @property string $password
+ * @property string|null $remember_token
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Notifications\DatabaseNotificationCollection|\Illuminate\Notifications\DatabaseNotification[] $notifications
+ * @property-read int|null $notifications_count
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\User newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\User newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\User query()
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\User whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\User whereEmail($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\User whereEmailVerifiedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\User whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\User whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\User wherePassword($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\User whereRememberToken($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\App\Entities\User whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class User extends Authenticatable
 {
     use Notifiable;
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,5 +80,7 @@ public function handle() @@
                 }
             }
+            return 0;
         }
     }