webmaster/crewsportswear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 3_20_19

Browse Source
This commit is contained in:
Frank John Begornia
2019-03-20 19:24:22 +08:00
parent a2d88bc52e
commit 68549cbf30
16 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/teamstore/TeamStoreController.php
View File

@@ -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,

2
app/Models/teamstore/TeamStoreModel.php
View File

@@ -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;

2
app/Models/user/UserModel.php
View File

@@ -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;

0
public/assets/js/jquery.mobile.custom.min.js vendored Normal file
View File

BIN
public/images/teamstore/familya-washington-dc/banner.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 42 KiB

BIN
public/images/teamstore/familya-washington-dc/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 287 KiB

2
resources/views/emails/orders.blade.php
View File

@@ -404,7 +404,7 @@
</td>
<td>
<div style="font-size: 14px;"><a href="{{ url('teamstore') . '/' . $item->StoreURL . '/' . 'product/' . $item->ProductURL }}">{{ $item->ProductName }}</a></div>
Total Price: ${{ $item->total_price * $item->total_qty }} &bull; Row(s): {{ $item->qty }}
Total Price: ${{ $item->total_price }} &bull; Row(s): {{ $item->qty }}
<table class="table table-condensed table-bordered" style="width: 100%; border-collapse: collapse;">
@if($item->FormUsed=="jersey-and-shorts-form")
<tr>

7
resources/views/layout/main.blade.php
View File

@@ -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();

2
resources/views/sublayouts/cart.blade.php
View File

@@ -73,7 +73,7 @@
</div>
<div class="col-md-9">
<h4><a href="{{ url('teamstore') . '/' . $item->StoreURL . '/' . 'product/' . $item->ProductURL }}">{{ $item->ProductName }}</a></h4>
<p>Total Price: ${{ $item->total_price * $item->total_qty }} &bull; Row(s): {{ $item->qty }} </p>
<p>Total Price: ${{ $item->total_price }} &bull; Row(s): {{ $item->qty }} </p>
<div class="table-responsive">
<table class="table table-striped table-condensed">

1
resources/views/teamstore-layout/main.blade.php
View File

@@ -80,6 +80,7 @@
$('.inputName').keyup(function() {
this.value = this.value.toLocaleUpperCase();
});
$('.btn-number').click(function(e){
e.preventDefault();

1
resources/views/teamstore-sublayouts/forms/jersey-and-shorts-form.blade.php
View File

@@ -22,6 +22,7 @@
<input type="hidden" name="price_holder" id="price_holder" value="{{ $product_array[0]->ProductPrice }}">
<input type="hidden" name="template_code" id="template_code" value="{{ $product_array[0]->TemplateCode }}">
<input type="hidden" name="store_url" id="store_url" value="{{ $store_array[0]->StoreUrl }}">
<input type="hidden" name="store_id" id="store_url" value="{{ $store_array[0]->Id }}">
<div class="panel-design-details" id="orderListPanel">

1
resources/views/teamstore-sublayouts/forms/name-number-form.blade.php
View File

@@ -22,6 +22,7 @@
<input type="hidden" name="price_holder" id="price_holder" value="{{ $product_array[0]->ProductPrice }}">
<input type="hidden" name="template_code" id="template_code" value="{{ $product_array[0]->TemplateCode }}">
<input type="hidden" name="store_url" id="store_url" value="{{ $store_array[0]->StoreUrl }}">
<input type="hidden" name="store_id" id="store_url" value="{{ $store_array[0]->Id }}">
<div class="panel-design-details" id="orderListPanel">

1
resources/views/teamstore-sublayouts/forms/name-number-size-form.blade.php
View File

@@ -22,6 +22,7 @@
<input type="hidden" name="price_holder" id="price_holder" value="{{ $product_array[0]->ProductPrice }}">
<input type="hidden" name="template_code" id="template_code" value="{{ $product_array[0]->TemplateCode }}">
<input type="hidden" name="store_url" id="store_url" value="{{ $store_array[0]->StoreUrl }}">
<input type="hidden" name="store_id" id="store_url" value="{{ $store_array[0]->Id }}">
<div class="panel-design-details" id="orderListPanel">

1
resources/views/teamstore-sublayouts/forms/quantity-form.blade.php
View File

@@ -22,6 +22,7 @@
<input type="hidden" name="price_holder" id="price_holder" value="{{ $product_array[0]->ProductPrice }}">
<input type="hidden" name="template_code" id="template_code" value="{{ $product_array[0]->TemplateCode }}">
<input type="hidden" name="store_url" id="store_url" value="{{ $store_array[0]->StoreUrl }}">
<input type="hidden" name="store_id" id="store_url" value="{{ $store_array[0]->Id }}">
<!-- <div class="panel-design-details" id="orderListPanel">

1
resources/views/teamstore-sublayouts/forms/tshirt-form.blade.php
View File

@@ -22,6 +22,7 @@
<input type="hidden" name="price_holder" id="price_holder" value="{{ $product_array[0]->ProductPrice }}">
<input type="hidden" name="template_code" id="template_code" value="{{ $product_array[0]->TemplateCode }}">
<input type="hidden" name="store_url" id="store_url" value="{{ $store_array[0]->StoreUrl }}">
<input type="hidden" name="store_id" id="store_url" value="{{ $store_array[0]->Id }}">
<!-- <div class="panel-design-details" id="orderListPanel">

2
resources/views/user-layouts/order_details.blade.php
View File

@@ -93,7 +93,7 @@
</div>
<div class="col-md-10">
<h4><a href="{{ url('teamstore') . '/' . $item->StoreURL . '/' . 'product/' . $item->ProductURL }}">{{ $item->ProductName }}</a></h4>
<p>Total Price: ${{ $item->total_price * $item->total_qty }} &bull; Row(s): {{ $item->qty }} </p>
<p>Total Price: ${{ $item->total_price }} &bull; Row(s): {{ $item->qty }} </p>
<div class="table-responsive">
<table class="table table-striped table-condensed">