From 0f2707698f9cc17ecfa7cd420b5f87231b8b87ae Mon Sep 17 00:00:00 2001 From: franknstayn Date: Fri, 10 Jan 2020 21:32:29 +0800 Subject: [PATCH 1/2] updates for cake presentation --- resources/views/designer/designer.blade.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/views/designer/designer.blade.php b/resources/views/designer/designer.blade.php index 06b20d6..4baebfa 100644 --- a/resources/views/designer/designer.blade.php +++ b/resources/views/designer/designer.blade.php @@ -284,6 +284,15 @@ @endif + + + @if($template->Type == "Cake" && $template->Side == "Front" && $template->TemplateFormat == "svg") + + @endif + @if($template->Type == "Cake" && $template->Side == "Back" && $template->TemplateFormat == "svg") + + @endif + @@ -1027,7 +1036,7 @@ var get_template_type = "{{ $template->Type }}"; // if((get_template_type != "Shirts") || (get_template_type != "Hoodie")){ - if(get_template_type != "Hoodie" && get_template_type != "Shirts" ){ + if(get_template_type != "Hoodie" && get_template_type != "Shirts" && get_template_type != "Cake" ){ addDefaultTeamText(); addNameNumber(); } From c392e3f2074362d63ac38ecba9f68cd3b18f682a Mon Sep 17 00:00:00 2001 From: franknstayn Date: Sat, 25 Jan 2020 18:41:59 +0800 Subject: [PATCH 2/2] added sending order to other_email - teamstore orders --- .../Controllers/paypal/PaypalController.php | 22 ++++++++++++++++++- app/Models/user/UserModel.php | 13 +++++++++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index 3ca6789..0bbeee0 100644 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -307,24 +307,44 @@ class PaypalController extends Controller { $array_payment_details = $newUserModel->selectPaymentDetails('CartKey', $cartKey); $array_storename = $newUserModel->selectTeamStoreName($cartKey); // email subject + foreach($array_storename as $storname){ $sName[] = $storname->StoreName; + $sid[] = $storname->Id; } $sName = implode (", ", $sName); + + $user_loginsArray = $newUserModel->selectUserLoginsWhereIn($sid); + + foreach($user_loginsArray as $userdata){ + + $other_email[] = $userdata->other_email; + } + + if($other_email[0] != null){ + $other_email = implode (", ", $other_email); + $email_cc = "orders@crewsportswear.com" . "," . $other_email; + }else{ + $email_cc = "orders@crewsportswear.com"; + } + + $explode_other_email = explode(",", $email_cc); + $data = array( 'order_item_array' => $order_item_array, 'item_goup_array' => $item_goup_array, 'img_thumb' => $item_thumbs, 'array_payment_details' => $array_payment_details, 'receiver' => $user_email, + 'email_cc' => $explode_other_email, 'subject' => $sName . ' ORDERS', ); Mail::send('emails.orders', $data, function($message) use ($data) { $message->from('no-reply@crewsportswear.com', 'CREW Sportswear'); - $message->cc('orders@crewsportswear.com', 'Orders From CREW Sportswear'); + $message->bcc($data['email_cc'], 'Orders From CREW Sportswear'); $message->to($data['receiver'])->subject($data['subject']); }); // end email sending diff --git a/app/Models/user/UserModel.php b/app/Models/user/UserModel.php index d14b1b3..dcd0925 100644 --- a/app/Models/user/UserModel.php +++ b/app/Models/user/UserModel.php @@ -29,7 +29,7 @@ class UserModel extends Model { function selectProfileInfo($id){ - $i = DB::table('user_logins')->select('user_logins.name', 'user_logins.username', 'user_logins.email', 'user_logins.email_is_verified', 'user_logins.role', 'user_logins.store_id', 'user_info.ContactNumber', 'user_info.Gender', 'user_info.Birthday') + $i = DB::table('user_logins')->select('user_logins.name', 'user_logins.username', 'user_logins.email', 'user_logins.email_is_verified','user_logins.other_email', 'user_logins.role', 'user_logins.store_id', 'user_info.ContactNumber', 'user_info.Gender', 'user_info.Birthday') ->leftjoin('user_info', 'user_info.UserId','=','user_logins.id') ->where('user_logins.id','=',$id) ->get(); @@ -254,12 +254,14 @@ class UserModel extends Model { function selectTeamStoreName($ck){ $pdo = DB::connection()->getPdo(); - $query = $pdo->prepare("SELECT t.StoreName FROM orders AS o INNER JOIN teamstores AS t ON t.Id = o.StoreId WHERE o.CartKey = :ck GROUP BY o.StoreId ORDER BY t.StoreName ASC"); + $query = $pdo->prepare("SELECT t.Id, t.StoreName FROM orders AS o INNER JOIN teamstores AS t ON t.Id = o.StoreId WHERE o.CartKey = :ck GROUP BY o.StoreId ORDER BY t.StoreName ASC"); $query->execute(array(':ck'=>$ck)); $row = $query->fetchAll(\PDO::FETCH_OBJ); return $row; } + + function updateActiveThumb($id, $product_id){ DB::table('teamstore_product_thumbnails')->where('ProductId', $product_id) ->update(['ImageClass' => null]); @@ -292,4 +294,11 @@ class UserModel extends Model { ->get(); return $i; } + + function selectUserLoginsWhereIn($ids){ + $i = DB::table('user_logins') + ->whereIn('store_id', $ids) + ->get(); + return $i; + } } \ No newline at end of file