merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved conflicts

This commit is contained in:
Jitendra Singh 2020-03-06 16:04:17 +05:30
parent 010ae65691
commit 73ce8a4dd7
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/Webkul/Velocity/src/Http/Controllers/Shop/ComparisonController.php
View File

@ -46,8 +46,8 @@ class ComparisonController extends Controller
}
$response = [
'status' => 'success',
'products' => $productCollection,
'status' => 'success',
'products' => $productCollection,
];
} else {
$response = view($this->_config['view']);
@ -67,27 +67,16 @@ class ComparisonController extends Controller
$customerId = auth()->guard('customer')->user()->id;
<<<<<<< HEAD
$compareProduct = $this->velocityCompareProductsRepository->findOneByField([
'customer_id' => $customerId,
=======
$compareProduct = $this->compareProductsRepository->findOneByField([
'customer_id' => $customerId,
>>>>>>> 276a2e288b172d3bacd05662b775a5b320185d51
'customer_id' => $customerId,
'product_flat_id' => $productId,
]);
if (! $compareProduct) {
// insert new row
<<<<<<< HEAD
$this->velocityCompareProductsRepository->create([
$this->compareProductsRepository->create([
'customer_id' => $customerId,
'product_flat_id' => $productId,
=======
$this->compareProductsRepository->create([
'customer_id' => $customerId,
'product_flat_id' => $productId,
>>>>>>> 276a2e288b172d3bacd05662b775a5b320185d51
]);
return response()->json([