Merge pull request #256 from oc-shopaholic/develop

Release version 1.26.0
oc-shopaholic · Mar 2, 2020 · fce3900 · fce3900
2 parents a1154e6 + 185bfb1
commit fce3900
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 5 deletions.
diff --git a/classes/event/offer/ExtendOfferFieldsHandler.php b/classes/event/offer/ExtendOfferFieldsHandler.php
@@ -24,6 +24,13 @@ class ExtendOfferFieldsHandler extends AbstractBackendFieldHandler
     protected function extendFields($obWidget)
     {
         $arAdditionFields = [
+            'measure'  => [
+                'label'       => 'lovata.shopaholic::lang.field.measure',
+                'type'        => 'relation',
+                'span'        => 'left',
+                'emptyOption' => 'lovata.toolbox::lang.field.empty',
+                'tab'         => 'lovata.shopaholic::lang.tab.dimensions',
+            ],
             'weight'           => [
                 'label' => $this->getWeightFieldLabel(),
                 'type'  => 'number',

diff --git a/classes/item/OfferItem.php b/classes/item/OfferItem.php
@@ -28,6 +28,8 @@
  * @property double                                                                                                                      $length
  * @property double                                                                                                                      $width
  * @property double                                                                                                                      $quantity_in_unit
+ * @property int                                                                                                                         $measure_id
+ * @property MeasureItem                                                                                                                 $measure
  * @property int                                                                                                                         $measure_of_unit_id
  * @property MeasureItem                                                                                                                 $measure_of_unit
  * @property MeasureItem                                                                                                                 $dimensions_measure
@@ -115,6 +117,10 @@ class OfferItem extends ElementItem
             'class' => ProductItem::class,
             'field' => 'product_id',
         ],
+        'measure' => [
+            'class' => MeasureItem::class,
+            'field' => 'measure_id',
+        ],
         'measure_of_unit' => [
             'class' => MeasureItem::class,
             'field' => 'measure_of_unit_id',

diff --git a/components/BrandPage.php b/components/BrandPage.php
@@ -15,10 +15,10 @@ class BrandPage extends ElementPage
 {
     protected $bNeedSmartURLCheck = true;
 
-    /** @var \Lovata\Shopaholic\Models\Brand */
+    /** @var Brand */
     protected $obElement;
 
-    /** @var \Lovata\Shopaholic\Classes\Item\BrandItem */
+    /** @var BrandItem */
     protected $obElementItem;
 
     /**

diff --git a/models/Offer.php b/models/Offer.php
@@ -45,6 +45,7 @@
  * @property double                                                                                        $length
  * @property double                                                                                        $width
  * @property double                                                                                        $quantity_in_unit
+ * @property int                                                                                           $measure_id
  * @property int                                                                                           $measure_of_unit_id
  * @property int                                                                                           $product_id
  * @property \October\Rain\Argon\Argon                                                                     $created_at
@@ -67,6 +68,8 @@
  *
  * @property Measure                                                                                       $measure_of_unit
  * @method static \October\Rain\Database\Relations\BelongsTo|Measure measure_of_unit()
+ * @property Measure                                                                                       $measure
+ * @method static \October\Rain\Database\Relations\BelongsTo|Measure measure()
  *
  * @method static $this getByProduct(int $iProductID)
  * @method static $this getByQuantity(int $iCount, string $sCondition = '=')
@@ -151,6 +154,7 @@ class Offer extends ImportModel
     public $belongsTo = [
         'product'          => [Product::class],
         'measure_of_unit' => [Measure::class, 'key' => 'measure_of_unit_id', 'order' => 'name asc'],
+        'measure' => [Measure::class, 'order' => 'name asc'],
     ];
     public $morphMany = [
         'price_link' => [
@@ -185,6 +189,7 @@ class Offer extends ImportModel
         'length',
         'width',
         'measure_of_unit_id',
+        'measure_id',
         'quantity_in_unit',
     ];
 
@@ -205,6 +210,7 @@ class Offer extends ImportModel
         'length',
         'width',
         'measure_of_unit_id',
+        'measure_id',
         'quantity_in_unit',
     ];
 
@@ -447,8 +453,8 @@ protected function getPriceListAttribute()
 
         foreach ($this->price_link as $obPrice) {
             $arResult[$obPrice->price_type_id] = [
-                'price'     => $obPrice->price,
-                'old_price' => $obPrice->old_price,
+                'price'     => $obPrice->price_value,
+                'old_price' => $obPrice->old_price_value,
             ];
         }
 

diff --git a/models/measure/fields.yaml b/models/measure/fields.yaml
@@ -4,3 +4,7 @@ fields:
         span: left
         required: 1
         type: text
+    code:
+        label: 'lovata.toolbox::lang.field.code'
+        span: right
+        type: text
diff --git a/updates/update_table_offers_add_measure_field.php b/updates/update_table_offers_add_measure_field.php
@@ -0,0 +1,42 @@
+<?php namespace Lovata\Shopaholic\Updates;
+
+use Schema;
+use October\Rain\Database\Schema\Blueprint;
+use October\Rain\Database\Updates\Migration;
+
+/**
+ * Class UpdateTableOffersAddMeasureField
+ * @package Lovata\Shopaholic\Updates
+ */
+class UpdateTableOffersAddMeasureField extends Migration
+{
+    const TABLE_NAME = 'lovata_shopaholic_offers';
+
+    /**
+     * Apply migration
+     */
+    public function up()
+    {
+        if (!Schema::hasTable(self::TABLE_NAME) || Schema::hasColumn(self::TABLE_NAME, 'measure_id')) {
+            return;
+        }
+
+        Schema::table(self::TABLE_NAME, function (Blueprint $obTable) {
+            $obTable->integer('measure_id')->nullable()->after('quantity');
+        });
+    }
+
+    /**
+     * Rollback migration
+     */
+    public function down()
+    {
+        if (!Schema::hasTable(self::TABLE_NAME) || !Schema::hasColumn(self::TABLE_NAME, 'measure_id')) {
+            return;
+        }
+
+        Schema::table(self::TABLE_NAME, function (Blueprint $obTable) {
+            $obTable->dropColumn(['measure_id']);
+        });
+    }
+}
diff --git a/updates/version.yaml b/updates/version.yaml
@@ -117,4 +117,7 @@
 1.25.0:
     - 'Moved "Measure" model from "Properties for Shopaholic" plugin. Added weight, height, length, width, measure_of_unit, quantity_in_unit fields to Offer model. Added new global settings: size unit measure, weight unit measure, piece unit measure.'
     - create_table_measure.php
-    - update_table_offers_add_dimensions_field.php
+    - update_table_offers_add_dimensions_field.php
+1.26.0:
+    - 'Added relation to Offer model with Measure model.'
+    - update_table_offers_add_measure_field.php