From eef4d279443890064c71a1c055d28e422f574076 Mon Sep 17 00:00:00 2001 From: Frank John Begornia Date: Mon, 4 Nov 2019 17:21:09 +0800 Subject: [PATCH] update 11_4_2019 --- .../designer/DesignerController.php | 7 ++- .../Controllers/paypal/PaypalController.php | 2 +- app/Http/Controllers/user/UserController.php | 4 +- app/Models/designer/DesignerModel.php | 5 +- app/Models/user/UserModel.php | 2 +- resources/views/designer/designer.blade.php | 61 ++++++++++++------- .../teamstore-sublayouts/index.blade.php | 4 +- .../views/user-layouts/store-orders.blade.php | 5 +- .../views/user-layouts/store_items.blade.php | 1 + .../user-layouts/user_template.blade.php | 2 + 10 files changed, 58 insertions(+), 35 deletions(-) diff --git a/app/Http/Controllers/designer/DesignerController.php b/app/Http/Controllers/designer/DesignerController.php index df8c5cf..0fb0256 100644 --- a/app/Http/Controllers/designer/DesignerController.php +++ b/app/Http/Controllers/designer/DesignerController.php @@ -252,7 +252,12 @@ class DesignerController extends Controller { $templateCode = $post['templateCode']; $default_template_color_array = $newDesignerModel->selectDefaultTemplateColor($templateCode); - echo json_encode($default_template_color_array); + // var_dump($default_template_color_array); + + return response()->json(array( + 'success' => true, + 'default_template_color_array' => $default_template_color_array + )); } diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index 7d33257..0303e0c 100644 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -114,7 +114,7 @@ class PaypalController extends Controller { // $tax_value = 0.10; - if($grouped_item[0]->StoreId == 76){ + if($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78){ $tax_value = 0; }else{ $tax_value = 0.10; diff --git a/app/Http/Controllers/user/UserController.php b/app/Http/Controllers/user/UserController.php index c08d17d..75e1dcd 100644 --- a/app/Http/Controllers/user/UserController.php +++ b/app/Http/Controllers/user/UserController.php @@ -958,14 +958,14 @@ class UserController extends Controller { function showStoreOrderDetails(Request $request){ - $post = $request->all(); + $post = $request->all(); + // var_dump($post['pid']); $UserModel = new UserModel; $array_payment_details = $UserModel->selectPaymentDetails('CartKey', $post['ck']); $array_shipping_add = $UserModel->selectShippingAddress('PaymentDetail_Id', $array_payment_details[0]->Id); $array_thumbnail_display = $UserModel->selectDisplayItemThumbById($post['pid']); $array_item = $UserModel->selectOrder('Id', $post['id']); - $handle_order_detail_body = view('user-layouts.order-details-body') ->with('array_payment_details', $array_payment_details) ->with('array_shipping_add', $array_shipping_add) diff --git a/app/Models/designer/DesignerModel.php b/app/Models/designer/DesignerModel.php index 6c4486a..f13ec2a 100644 --- a/app/Models/designer/DesignerModel.php +++ b/app/Models/designer/DesignerModel.php @@ -42,9 +42,8 @@ class DesignerModel extends Model { $pdo = DB::connection()->getPdo(); $query = $pdo->prepare("SELECT NULL AS RGBIndex, RGBColor AS default_Color, DisplayName FROM template_body_colors WHERE TemplateCode = '$templateCode' UNION SELECT TrimNumber, RGBColor AS default_Color, DisplayName FROM template_trim_colors WHERE TemplateCode = '$templateCode'"); - $query->execute();//$query->execute(array($bindings )); - // $row=$query->fetch(\PDO::FETCH_OBJ); - + $query->execute(); + while($row=$query->fetch(\PDO::FETCH_OBJ)) { if($row->RGBIndex == NULL){ $IndexName = "default_mainColor"; diff --git a/app/Models/user/UserModel.php b/app/Models/user/UserModel.php index 1113109..8f58058 100644 --- a/app/Models/user/UserModel.php +++ b/app/Models/user/UserModel.php @@ -161,7 +161,7 @@ class UserModel extends Model { } function selectStoreOrders($store_id){ - $i = DB::table('orders')->select('orders.*', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*') + $i = DB::table('orders')->select('orders.*', 'orders.Id as Order_Id', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*') ->leftjoin('payment_details', 'payment_details.CartKey','=','orders.CartKey') ->leftjoin('shipping_addresses', 'shipping_addresses.PaymentDetail_Id','=','payment_details.Id') ->where('orders.StoreId', $store_id) diff --git a/resources/views/designer/designer.blade.php b/resources/views/designer/designer.blade.php index 3ffffce..06b20d6 100644 --- a/resources/views/designer/designer.blade.php +++ b/resources/views/designer/designer.blade.php @@ -445,7 +445,7 @@ - @if($template->Type == "Shirts") + - +

Trim {{ $i }}