Merge branch 'master' into cancel-order-test-case

Merged with master.

packages/Webkul/Product/src/Repositories/ProductRepository.php

@@ -122,8 +122,8 @@ class ProductRepository extends Repository
 
         if ($categoryId) {
             $qb->where('product_categories.category_id', $categoryId);
-        }    
-        
+        }
+
         return $qb->get();
     }
 
@@ -334,7 +334,7 @@ class ProductRepository extends Repository
      */
     public function getNewProducts()
     {
-        $count = core()->getConfigData('catalog.products.homepage.no_of_new_product_homepage'); 
+        $count = core()->getConfigData('catalog.products.homepage.no_of_new_product_homepage');
 
         $results = app(ProductFlatRepository::class)->scopeQuery(function ($query) {
             $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
@@ -614,7 +614,7 @@ class ProductRepository extends Repository
     {
         $ids = [];
 
-        foreach (['name', 'sku', 'status', 'url_key'] as $code) {
+        foreach (['name', 'sku', 'product_number', 'status', 'url_key'] as $code) {
             $ids[$code] = Attribute::query()->where(['code' => $code])->firstOrFail()->id;
         }
 
@@ -675,6 +675,18 @@ class ProductRepository extends Repository
                 $newProductFlat->sku = $copiedProduct->sku;
             }
 
+            // change product number
+            if ($oldValue->attribute_id === $attributeIds['product_number']) {
+                $copyProductNumber = trans('admin::app.copy-of-slug');
+                $copiedProductNumber = sprintf('%s%s-%s',
+                    Str::startsWith($originalProduct->product_number, $copyProductNumber) ? '' : $copyProductNumber,
+                    $originalProduct->product_number,
+                    $randomSuffix
+                );
+                $newValue->text_value = $copiedProductNumber;
+                $newProductFlat->product_number = $copiedProductNumber;
+            }
+
             // force the copied product to be inactive so the admin can adjust it before release
             if ($oldValue->attribute_id === $attributeIds['status']) {
                 $newValue->boolean_value = 0;

tests/functional/Admin/Catalog/ProductCest.php

@@ -2,26 +2,44 @@
 
 namespace Tests\Functional\Admin\Catalog;
 
-use FunctionalTester;
 use Faker\Factory;
-use Webkul\Attribute\Models\Attribute;
-use Webkul\Attribute\Models\AttributeFamily;
-use Webkul\Attribute\Models\AttributeOption;
-use Webkul\Core\Helpers\Laravel5Helper;
+use FunctionalTester;
 use Webkul\Core\Models\Locale;
 use Webkul\Product\Models\Product;
+use Webkul\Attribute\Models\Attribute;
+use Webkul\Core\Helpers\Laravel5Helper;
+use Webkul\Attribute\Models\AttributeFamily;
+use Webkul\Attribute\Models\AttributeOption;
 use Webkul\Product\Models\ProductAttributeValue;
 
 class ProductCest
 {
-    /** @var Factory $faker */
+    /**
+     * Factory $faker
+     *
+     * @var Faker\Factory
+     */
     private $faker;
 
-    /** @var Attribute $attributeBrand */
+    /**
+     * Attribute $attributeBrand
+     *
+     * @var Webkul\Attribute\Models\Attribute
+     */
     private $attributeBrand;
-    /** @var AttributeOption $attributeBrandDefaultOption */
+
+    /**
+     * AttributeOption $attributeBrandDefaultOption
+     *
+     * @var Webkul\Attribute\Models\AttributeOption
+     */
     private $attributeBrandDefaultOption;
-    /** @var AttributeOption $attributeBrandOption */
+
+    /**
+     * AttributeOption $attributeBrandOption
+     *
+     * @var Webkul\Attribute\Models\AttributeOption
+     */
     private $attributeBrandOption;
 
     public function _before(FunctionalTester $I): void
@@ -47,12 +65,10 @@ class ProductCest
             ];
         }
 
-        $this->attributeBrandDefaultOption = $I->have(AttributeOption::class,
-            $defaultAttributeOptionAttributes);
+        $this->attributeBrandDefaultOption = $I->have(AttributeOption::class, $defaultAttributeOptionAttributes);
         $this->attributeBrandOption = $I->have(AttributeOption::class, [
             'attribute_id' => $this->attributeBrand->id,
         ]);
-
     }
 
     public function testIndex(FunctionalTester $I): void
@@ -90,9 +106,7 @@ class ProductCest
 
         $I->fillField('sku', $sku);
         $I->click(__('admin::app.catalog.products.save-btn-title'));
-
         $I->seeInSource('Product created successfully.');
-
         $I->seeCurrentRouteIs('admin.catalog.products.edit');
 
         $productTitle = $this->faker->word;
@@ -100,11 +114,9 @@ class ProductCest
 
         $I->fillField('name', $productTitle);
         $I->fillField('url_key', $productUrlKey);
-        $I->selectOption($this->attributeBrand->code,
-            $this->attributeBrandDefaultOption->id);
+        $I->selectOption($this->attributeBrand->code, $this->attributeBrandDefaultOption->id);
         $I->fillField('price', $this->faker->randomFloat(2));
         $I->fillField('weight', $this->faker->randomDigit);
-
         $I->fillField('short_description', $this->faker->paragraph(1, true));
         $I->fillField('description', $this->faker->paragraph(5, true));
 
@@ -119,11 +131,18 @@ class ProductCest
             'attribute_family_id' => $attributeFamily->id,
         ]);
 
+        $productAttribute = $I->grabRecord(ProductAttributeValue::class, [
+            'product_id'    => $product->id,
+            'attribute_id'  => $this->attributeBrand->id,
+            'integer_value' => $this->attributeBrandDefaultOption->id
+        ]);
+
         $I->seeRecord(ProductAttributeValue::class, [
             'product_id'    => $product->id,
             'attribute_id'  => $this->attributeBrand->id,
-            'integer_value' => $this->attributeBrandDefaultOption->id,
-            'text_value'    => null,
+            'integer_value' => $this->attributeBrandDefaultOption->id
         ]);
+
+        $I->assertNull($productAttribute->text_value);
     }
 }