diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php index cf695f8..4108a94 100644 --- a/app/Http/Controllers/teamstore/TeamStoreController.php +++ b/app/Http/Controllers/teamstore/TeamStoreController.php @@ -220,6 +220,7 @@ class TeamStoreController extends Controller { $product_id = $post['product_id']; $store_url = $post['store_url']; + $store_id = $post['store_id']; if($request->session()->has('cartkey')){ $cartKey = $request->session()->get('cartkey'); @@ -253,6 +254,7 @@ class TeamStoreController extends Controller { $items[] = array( 'ProductId' => $product_id, 'StoreURL' => $store_url, + 'StoreId' => $store_id, 'FormUsed' => $product_form, 'CartKey' => $cartKey, 'DesignCode' => $design_code, @@ -271,6 +273,7 @@ class TeamStoreController extends Controller { $items[] = array( 'ProductId' => $product_id, 'StoreURL' => $store_url, + 'StoreId' => $store_id, 'FormUsed' => $product_form, 'CartKey' => $cartKey, 'DesignCode' => $design_code, @@ -285,6 +288,7 @@ class TeamStoreController extends Controller { $items[] = array( 'ProductId' => $product_id, 'StoreURL' => $store_url, + 'StoreId' => $store_id, 'FormUsed' => $product_form, 'CartKey' => $cartKey, 'DesignCode' => $design_code, @@ -304,6 +308,7 @@ class TeamStoreController extends Controller { $items[] = array( 'ProductId' => $product_id, 'StoreURL' => $store_url, + 'StoreId' => $store_id, 'FormUsed' => $product_form, 'CartKey' => $cartKey, 'DesignCode' => $design_code, @@ -325,6 +330,7 @@ class TeamStoreController extends Controller { $items[] = array( 'ProductId' => $product_id, 'StoreURL' => $store_url, + 'StoreId' => $store_id, 'FormUsed' => $product_form, 'CartKey' => $cartKey, 'DesignCode' => $design_code, diff --git a/app/Models/teamstore/TeamStoreModel.php b/app/Models/teamstore/TeamStoreModel.php index 90b899b..a56af8e 100644 --- a/app/Models/teamstore/TeamStoreModel.php +++ b/app/Models/teamstore/TeamStoreModel.php @@ -111,7 +111,7 @@ class TeamStoreModel extends Model { function myCartGroup($cartKey){ if($cartKey != ""){ $pdo = DB::connection()->getPdo(); - $query = $pdo->prepare("SELECT *, COUNT(Id) AS qty, SUM(Price) AS total_price, SUM(Quantity) AS total_qty FROM cart_tmp WHERE CartKey = :ck GROUP BY ProductId"); + $query = $pdo->prepare("SELECT *, COUNT(Id) AS qty, SUM(Price) * Quantity AS total_price FROM cart_tmp WHERE CartKey = :ck GROUP BY ProductId"); $query->execute([':ck'=>$cartKey]); $row = $query->fetchAll(\PDO::FETCH_OBJ); return $row; diff --git a/app/Models/user/UserModel.php b/app/Models/user/UserModel.php index b2281fb..5a23cdd 100644 --- a/app/Models/user/UserModel.php +++ b/app/Models/user/UserModel.php @@ -144,7 +144,7 @@ class UserModel extends Model { function itemGroup($cartKey){ $pdo = DB::connection()->getPdo(); - $query = $pdo->prepare("SELECT *, COUNT(Id) AS qty, SUM(Price) AS total_price, SUM(Quantity) AS total_qty FROM orders WHERE CartKey = :ck GROUP BY ProductId"); + $query = $pdo->prepare("SELECT *, COUNT(Id) AS qty, SUM(Price) * Quantity AS total_price FROM orders WHERE CartKey = :ck GROUP BY ProductId"); $query->execute([':ck'=>$cartKey]); $row = $query->fetchAll(\PDO::FETCH_OBJ); return $row; diff --git a/public/assets/js/jquery.mobile.custom.min.js b/public/assets/js/jquery.mobile.custom.min.js new file mode 100644 index 0000000..e69de29 diff --git a/public/images/teamstore/familya-washington-dc/banner.png b/public/images/teamstore/familya-washington-dc/banner.png new file mode 100644 index 0000000..5835422 Binary files /dev/null and b/public/images/teamstore/familya-washington-dc/banner.png differ diff --git a/public/images/teamstore/familya-washington-dc/logo.png b/public/images/teamstore/familya-washington-dc/logo.png new file mode 100644 index 0000000..96fdeb8 Binary files /dev/null and b/public/images/teamstore/familya-washington-dc/logo.png differ diff --git a/resources/views/emails/orders.blade.php b/resources/views/emails/orders.blade.php index 2953e60..cdb8d75 100644 --- a/resources/views/emails/orders.blade.php +++ b/resources/views/emails/orders.blade.php @@ -404,7 +404,7 @@
{{ $item->ProductName }}
- Total Price: ${{ $item->total_price * $item->total_qty }} • Row(s): {{ $item->qty }} + Total Price: ${{ $item->total_price }} • Row(s): {{ $item->qty }} @if($item->FormUsed=="jersey-and-shorts-form") diff --git a/resources/views/layout/main.blade.php b/resources/views/layout/main.blade.php index 7bce7ba..d637e01 100644 --- a/resources/views/layout/main.blade.php +++ b/resources/views/layout/main.blade.php @@ -83,9 +83,10 @@ $(function(){ myCart(); $(".hide-row").hide(); - $(window).scroll(function() { - $('.order-summary').css('top', $(this).scrollTop()); - }); + + // $(window).scroll(function() { + // $('.order-summary').css('top', $(this).scrollTop()); + // }); $('.modal').on('show.bs.modal', function() { $(this).show(); diff --git a/resources/views/sublayouts/cart.blade.php b/resources/views/sublayouts/cart.blade.php index 64d9db2..6b2db61 100644 --- a/resources/views/sublayouts/cart.blade.php +++ b/resources/views/sublayouts/cart.blade.php @@ -73,7 +73,7 @@

{{ $item->ProductName }}

-

Total Price: ${{ $item->total_price * $item->total_qty }} • Row(s): {{ $item->qty }}

+

Total Price: ${{ $item->total_price }} • Row(s): {{ $item->qty }}

diff --git a/resources/views/teamstore-layout/main.blade.php b/resources/views/teamstore-layout/main.blade.php index e353ba3..4d02a3a 100644 --- a/resources/views/teamstore-layout/main.blade.php +++ b/resources/views/teamstore-layout/main.blade.php @@ -80,6 +80,7 @@ $('.inputName').keyup(function() { this.value = this.value.toLocaleUpperCase(); }); + $('.btn-number').click(function(e){ e.preventDefault(); diff --git a/resources/views/teamstore-sublayouts/forms/jersey-and-shorts-form.blade.php b/resources/views/teamstore-sublayouts/forms/jersey-and-shorts-form.blade.php index 7674e40..5e547a0 100644 --- a/resources/views/teamstore-sublayouts/forms/jersey-and-shorts-form.blade.php +++ b/resources/views/teamstore-sublayouts/forms/jersey-and-shorts-form.blade.php @@ -22,6 +22,7 @@ +
diff --git a/resources/views/teamstore-sublayouts/forms/name-number-form.blade.php b/resources/views/teamstore-sublayouts/forms/name-number-form.blade.php index c828fde..86ad38e 100644 --- a/resources/views/teamstore-sublayouts/forms/name-number-form.blade.php +++ b/resources/views/teamstore-sublayouts/forms/name-number-form.blade.php @@ -22,6 +22,7 @@ +
diff --git a/resources/views/teamstore-sublayouts/forms/name-number-size-form.blade.php b/resources/views/teamstore-sublayouts/forms/name-number-size-form.blade.php index d0726b4..14d3fee 100644 --- a/resources/views/teamstore-sublayouts/forms/name-number-size-form.blade.php +++ b/resources/views/teamstore-sublayouts/forms/name-number-size-form.blade.php @@ -22,6 +22,7 @@ +
diff --git a/resources/views/teamstore-sublayouts/forms/quantity-form.blade.php b/resources/views/teamstore-sublayouts/forms/quantity-form.blade.php index 927a49e..8c33a6c 100644 --- a/resources/views/teamstore-sublayouts/forms/quantity-form.blade.php +++ b/resources/views/teamstore-sublayouts/forms/quantity-form.blade.php @@ -22,6 +22,7 @@ +