Merge pull request #96 from rachana-webkul/master

store user validation fixed
bagisto · Jul 21, 2023 · f9cac69 · f9cac69
2 parents 585fad9 + 90ff304
commit f9cac69
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/src/Http/Controllers/V1/Admin/Setting/SliderController.php b/src/Http/Controllers/V1/Admin/Setting/SliderController.php
@@ -51,7 +51,7 @@ public function store(Request $request)
             $data['locale'] = implode(',', $data['locale']);
         }
 
-        $result = $this->getRepositoryInstance()->save($data);
+        $result = $this->getRepositoryInstance()->create($data);
 
         if ($result) {
             $slider = $this->getRepositoryInstance()->latest('id')->first();
@@ -96,10 +96,9 @@ public function update(Request $request, $id)
             return response([
                 'message' => __('rest-api::app.common-response.error.something-went-wrong'),
             ], 500);
-        }
-
-        $result = $this->getRepositoryInstance()->updateItem($data, $id);
-
+        }  
+
+        $result = $this->getRepositoryInstance()->update($data, $id);
         if ($result) {
             return response([
                 'data'      => $this->getRepositoryInstance()->find($id),

diff --git a/src/Http/Controllers/V1/Admin/Setting/TaxCategoryController.php b/src/Http/Controllers/V1/Admin/Setting/TaxCategoryController.php
@@ -47,7 +47,7 @@ public function store(Request $request)
 
         $taxCategory = $this->getRepositoryInstance()->create($data);
 
-        $this->getRepositoryInstance()->attachOrDetach($taxCategory, $data['taxrates']);
+        $taxCategory->tax_rates()->sync($data['taxrates']);
 
         return response([
             'data'    => new TaxCategoryResource($this->getRepositoryInstance()->find($taxCategory->id)),
@@ -75,9 +75,7 @@ public function update(Request $request, $id)
 
         $taxCategory = $this->getRepositoryInstance()->update($data, $id);
 
-        $taxRates = $data['taxrates'];
-
-        $this->getRepositoryInstance()->attachOrDetach($taxCategory, $taxRates);
+        $taxCategory->tax_rates()->sync($data['taxrates']);
 
         return response([
             'data'    => new TaxCategoryResource($this->getRepositoryInstance()->find($taxCategory->id)),

diff --git a/src/Http/Controllers/V1/Admin/Setting/UserController.php b/src/Http/Controllers/V1/Admin/Setting/UserController.php
@@ -38,7 +38,6 @@ public function resource()
     public function store(UserForm $request)
     {
         $data = $request->all();
-
         if (isset($data['password']) && $data['password']) {
             $data['password'] = bcrypt($data['password']);
             $data['api_token'] = Str::random(80);

diff --git a/src/Http/Resources/V1/Shop/Catalog/ProductResource.php b/src/Http/Resources/V1/Shop/Catalog/ProductResource.php
@@ -102,19 +102,19 @@ private function specialPriceInfo()
 
         return [
             'special_price'           => $this->when(
-                $productTypeInstance ->haveSpecialPrice(),
+                $productTypeInstance ->haveDiscount(),
                 core()->convertPrice($productTypeInstance->getMinimalPrice())
             ),
             'formatted_special_price' => $this->when(
-                $productTypeInstance->haveSpecialPrice(),
+                $productTypeInstance->haveDiscount(),
                 core()->currency($productTypeInstance->getMinimalPrice())
             ),
             'regular_price'           => $this->when(
-                $productTypeInstance->haveSpecialPrice(),
+                $productTypeInstance->haveDiscount(),
                 data_get($productTypeInstance->getProductPrices(), 'regular_price.price')
             ),
             'formatted_regular_price' => $this->when(
-                $productTypeInstance->haveSpecialPrice(),
+                $productTypeInstance->haveDiscount(),
                 data_get($productTypeInstance->getProductPrices(), 'regular_price.formated_price')
             ),
         ];