diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index fd9c943..8e6fb61 100644 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -108,12 +108,9 @@ class PaypalController extends Controller { $order_items = array(); $updated_items = $m->myCart($cartKey); $updated_getSubtotal = $m->getSubtotal($cartKey); - var_dump($updated_items); // $order_subtotal = $updated_getSubtotal[0]->Subtotal; $order_grandtotal = $updated_getSubtotal[0]->Subtotal; - var_dump($order_grandtotal); - // $tax_value = 0.10; if($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78){ $tax_value = 0; @@ -122,8 +119,6 @@ class PaypalController extends Controller { } $tax = $order_grandtotal * $tax_value; - - var_dump($tax); foreach($updated_items as $key => $item){ @@ -141,13 +136,9 @@ class PaypalController extends Controller { $item_list = PayPal::ItemList(); $item_list->setItems($order_items); - var_dump($order_grandtotal); $amount_details = PayPal::Details(); $amount_details->setSubtotal($order_grandtotal); $amount_details->setTax($tax); - - - var_dump($item_list->items); $amount = PayPal::Amount(); $amount->setCurrency($store_array[0]->StoreCurrency); diff --git a/app/Http/Controllers/user/UserController.php b/app/Http/Controllers/user/UserController.php index cac5d6d..9e46f52 100644 --- a/app/Http/Controllers/user/UserController.php +++ b/app/Http/Controllers/user/UserController.php @@ -823,7 +823,7 @@ class UserController extends Controller { $arrayItems = $post['item']; $order = 1; $UserModel = new UserModel; - + foreach ($arrayItems as $item) { $i = $UserModel->updateThumbnailOrdering($order, $item); $order++; @@ -835,6 +835,25 @@ class UserController extends Controller { )); } + function saveItemOrdering(Request $request){ + $post = $request->all(); + $arrayItems = $post['order_number']; + $order = 1; + $UserModel = new UserModel; + + foreach ($arrayItems as $item) { + $i = $UserModel->updateItemOrdering($order, $item); + $order++; + } + + return response()->json(array( + 'success' => true, + 'message' => 'success' + )); + } + + + function storeSettingUpdate(Request $request){ $post = $request->all(); $UserModel = new UserModel; @@ -982,4 +1001,55 @@ class UserController extends Controller { 'item' => $array_item )); } + + + function itemStoreReArrange(){ + $thumbnails = array(); + $newUserModel = new UserModel; + $newTeamStoreModel = new TeamStoreModel; + + $user_role = Auth::user()->role; + $store_id = Auth::user()->store_id; + + $store_array = $newTeamStoreModel->selectTeamStore('Id', $store_id); + $product_array = $newTeamStoreModel->selectTeamStoreProducts('TeamStoreId', $store_id); + + foreach ($product_array as $p => $pr_arr) { + + $thumbnails_array = $newTeamStoreModel->getProductThumbnails($pr_arr->Id); + + if(!empty($thumbnails_array)){ + foreach ($thumbnails_array as $t => $thumb) { + + if($thumb->ImageClass == 'custom'){ + $displayThumbnails = $thumb->Image; + break; + } + + if($thumb->ImageClass == 'active'){ + $displayThumbnails = $thumb->Image; + break; + } + } + + $thumbnails[] = array( + 'folder' => $store_array[0]->ImageFolder, + 'product_id' => $pr_arr->Id, + 'thumb' => $displayThumbnails + ); + + }else{ + $thumbnails[] = array( + 'folder' => $store_array[0]->ImageFolder, + 'product_id' => $pr_arr->Id, + 'thumb' => "product-image-placeholder.png" + ); + } + + } + + return view('user-layouts.store_items_arrange')->with('store_array', $store_array) + ->with('product_array', $product_array) + ->with('thumbnails', $thumbnails); + } } diff --git a/app/Http/routes.php b/app/Http/routes.php index 4bf9476..a8064fa 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -123,11 +123,12 @@ Route::group(['middleware' => 'normaluser'], function () { Route::post('user/store-items/save-new-item', 'user\UserController@saveNewItem'); Route::post('user/update-active-thumbnail', 'user\UserController@updateActiveThumbnail'); Route::post('user/post/save-thumbnail-ordering', 'user\UserController@saveThumbnailOrdering'); + Route::post('user/post/save-item-ordering', 'user\UserController@saveItemOrdering'); Route::post('user/post/show-store-order-details', 'user\UserController@showStoreOrderDetails'); Route::post('user/post/delete-image-thumb', 'user\UserController@deleteImageThumb'); Route::post('user/store-items/save-new-item-image', 'user\UserController@saveNewItemImage'); - - + Route::get('user/store-items/re-arrange', 'user\UserController@itemStoreReArrange'); + Route::get('user/my-designs/sell-design/{designCode}', 'user\UserController@sellDesign'); Route::post('user/my-designs/addstoreitem', 'user\UserController@saveNewStoreItem'); diff --git a/app/Models/user/UserModel.php b/app/Models/user/UserModel.php index 8f58058..d14b1b3 100644 --- a/app/Models/user/UserModel.php +++ b/app/Models/user/UserModel.php @@ -272,6 +272,11 @@ class UserModel extends Model { ->update(['Ordering' => $order]); } + function updateItemOrdering($order, $id){ + $i = DB::table('teamstore_products')->where('Id', $id) + ->update(['Ordering' => $order]); + } + function updateTeamstore($id, $data){ $i = DB::table('teamstores') diff --git a/resources/views/user-layouts/store_items.blade.php b/resources/views/user-layouts/store_items.blade.php index d77d7e8..15d7d42 100644 --- a/resources/views/user-layouts/store_items.blade.php +++ b/resources/views/user-layouts/store_items.blade.php @@ -44,11 +44,11 @@ Add new Item - + Re-arrange item -
+ @foreach($product_array as $i => $product) @foreach($thumbnails as $t => $thumb) @if($thumb['product_id'] == $product->Id) @@ -56,7 +56,7 @@ @define $filename = $thumb['thumb'] @endif @endforeach -
+
{{ $product->ProductName }} @@ -71,7 +71,6 @@
@endforeach -
diff --git a/resources/views/user-layouts/store_items_arrange.blade.php b/resources/views/user-layouts/store_items_arrange.blade.php new file mode 100644 index 0000000..80130eb --- /dev/null +++ b/resources/views/user-layouts/store_items_arrange.blade.php @@ -0,0 +1,84 @@ +@extends('user-layouts.user_template') +@section('content') + +
+ +
+

+ Store Item Arrangement + +

+
    +
  1. Home
    2. + +
  2. Store Item Arrangement
    3. + +
+
+ + +
+
+
+
+
+

+ Item List +

+
+
+
+
+
+ + Cancel +
+
+
+
+ @foreach($product_array as $i => $product) + @foreach($thumbnails as $t => $thumb) + @if($thumb['product_id'] == $product->Id) + @define $storeFolder = $thumb['folder'] + @define $filename = $thumb['thumb'] + @endif + @endforeach +
+
+ + {{ $product->ProductName }} + +
+
+
{{ $product->PrivacyStatus }}
+
+

{{ $product->ProductName }}
$ {{ $product->ProductPrice }}

+
+
+ @endforeach +
+
+
+
+
+
+ +
+@endsection diff --git a/resources/views/user-layouts/user_template.blade.php b/resources/views/user-layouts/user_template.blade.php index b6ecc19..7ca5a91 100644 --- a/resources/views/user-layouts/user_template.blade.php +++ b/resources/views/user-layouts/user_template.blade.php @@ -783,8 +783,6 @@ $('#btn_save_thumbnail_sorting').on('click', function(e) { e.preventDefault(); var sortable_data = tr_sortable.sortable('serialize'); - // div_response . text ( 'Save' ); - // console.log(sortable_data); $.ajax({ data: sortable_data, type: 'POST', @@ -808,6 +806,32 @@ }); }); + $('#btn_save_item_sorting').on('click', function(e) { + e.preventDefault(); + var sorted_data = item_list_sort.sortable('serialize'); + $.ajax({ + data: sorted_data, + type: 'POST', + url : "{{ url('user/post/save-item-ordering') }}", + beforeSend:function(xhr){ + + var token = $('meta[name="csrf_token"]').attr('content'); + + if (token) { + return xhr.setRequestHeader('X-CSRF-TOKEN', token); + } + xhr.setRequestHeader( 'X-Requested-With', 'XMLHttpRequest'); + }, + success:function(result) { + // div_response.html(result); + console.log(result); + if(result.success){ + alert('Item ordering is succcessfully updated!'); + } + } + }); + }); + $('#myModal').on('hidden.bs.modal', function () { location.reload(); });