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

update

Browse Source
This commit is contained in:
franknstayn
2020-09-29 01:05:01 -05:00
parent 3eb4078d19
commit bf88584dcd
10 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/paypal/PaypalController.php
View File

@@ -140,7 +140,7 @@ class PaypalController extends Controller
// $order_subtotal = $updated_getSubtotal[0]->Subtotal; // $order_subtotal = $updated_getSubtotal[0]->Subtotal;
$order_grandtotal = $updated_getSubtotal[0]->Subtotal; $order_grandtotal = $updated_getSubtotal[0]->Subtotal;
if ($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30 || $grouped_item[0]->StoreId == 141 || $grouped_item[0]->StoreId == 162) { if ($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30 || $grouped_item[0]->StoreId == 141 || $grouped_item[0]->StoreId == 162 || $grouped_item[0]->StoreId == 185) {
$tax_value = 0; $tax_value = 0;
} else { } else {
$tax_value = 0.10; $tax_value = 0.10;

6
resources/views/designer/design_preview.blade.php
View File

@@ -355,7 +355,11 @@
} }
}else{ }else{
gen_url = ip+":"+port+"/tb/{{ $client_design_array[0]->DesignCode }}"; if(port == 5953){
gen_url = ip+":"+port+"/classic-mask/{{ $client_design_array[0]->DesignCode }}";
}else{
gen_url = ip+":"+port+"/tb/{{ $client_design_array[0]->DesignCode }}";
}
} }
$.ajax({ //create an ajax request to load_page.php $.ajax({ //create an ajax request to load_page.php

8
resources/views/designer/designer.blade.php
View File

@@ -284,6 +284,14 @@
<canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="158px" height="174px" style="margin-top:171px; margin-left:0xp;"></canvas> <canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="158px" height="174px" style="margin-top:171px; margin-left:0xp;"></canvas>
@endif @endif
<!-- Hoodie All over Print -->
@if($template->Type == "Hoodie" && $template->Side == "Front" && $template->TemplateFormat == "png")
<canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="512px" height="512px" style="position:absolute; top: 50%; left: 50%;"></canvas>
@endif
@if($template->Type == "Hoodie" && $template->Side == "Back" && $template->TemplateFormat == "png")
<canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="512px" height="512px" style="position:absolute; top: 50%; left: 50%;"></canvas>
@endif
<!-- Cake --> <!-- Cake -->
@if($template->Type == "Cake" && $template->Side == "Front" && $template->TemplateFormat == "svg") @if($template->Type == "Cake" && $template->Side == "Front" && $template->TemplateFormat == "svg")

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

@@ -13,7 +13,7 @@
<meta property="og:url" content="https://crewsportswear.com" /> <meta property="og:url" content="https://crewsportswear.com" />
<meta property="og:type" content="article" /> <meta property="og:type" content="article" />
<meta property="og:title" content="CREW Uniform Customizer" /> <meta property="og:title" content="CREW Apparel" />
<meta property="og:description" content="Custom Uniforms offered in a variety colors to match your team. Browse through our baseball, fastpitch, softball, lacrosse, football, volleyball and basketball gear." /> <meta property="og:description" content="Custom Uniforms offered in a variety colors to match your team. Browse through our baseball, fastpitch, softball, lacrosse, football, volleyball and basketball gear." />
<meta property="og:image" content="{{asset('public/images/fb-share-logo.png')}}" /> <meta property="og:image" content="{{asset('public/images/fb-share-logo.png')}}" />

2
resources/views/paypal/get_done.blade.php
View File

@@ -12,7 +12,7 @@
<meta property="og:url" content="http://uniformnetwork.com/crew/" /> <meta property="og:url" content="http://uniformnetwork.com/crew/" />
<meta property="og:type" content="article" /> <meta property="og:type" content="article" />
<meta property="og:title" content="CREW Uniform Customizer" /> <meta property="og:title" content="CREW Apparel" />
<meta property="og:description" content="Custom Uniforms offered in a variety colors to match your team. Browse through our baseball, fastpitch, softball, lacrosse, football, volleyball and basketball gear." /> <meta property="og:description" content="Custom Uniforms offered in a variety colors to match your team. Browse through our baseball, fastpitch, softball, lacrosse, football, volleyball and basketball gear." />
<meta property="og:image" content="{{asset('public/images/fb-share-logo.png')}}" /> <meta property="og:image" content="{{asset('public/images/fb-share-logo.png')}}" />

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

@@ -13,7 +13,7 @@
<meta property="og:url" content="https://crewsportswear.com" /> <meta property="og:url" content="https://crewsportswear.com" />
<meta property="og:type" content="article" /> <meta property="og:type" content="article" />
<meta property="og:title" content="CREW Uniform Customizer" /> <meta property="og:title" content="CREW Apparel" />
<meta property="og:description" content="Custom Uniforms offered in a variety colors to match your team. Browse through our baseball, fastpitch, softball, lacrosse, football, volleyball and basketball gear." /> <meta property="og:description" content="Custom Uniforms offered in a variety colors to match your team. Browse through our baseball, fastpitch, softball, lacrosse, football, volleyball and basketball gear." />
<meta property="og:image" content="{{asset('public/images/logo.png')}}" /> <meta property="og:image" content="{{asset('public/images/logo.png')}}" />

31
resources/views/teamstore-sublayouts/index.blade.php
View File

@@ -145,14 +145,29 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12"> @if($store_array[0]->Id == 174 || $store_array[0]->Id == 175 || $store_array[0]->Id == 178 || $store_array[0]->Id == 184 || $store_array[0]->Id == 179 || $store_array[0]->Id == 177 || $store_array[0]->Id == 189 || $store_array[0]->Id == 176 || $store_array[0]->Id == 190 || $store_array[0]->Id == 191 || $store_array[0]->Id == 192 || $store_array[0]->Id == 194)
<div class="alert alert-warning"> <div class="col-md-12">
<p><b>Please read:</b></p> <div class="alert alert-warning">
1. Items purchased are made on demand. Please allow 2-3 weeks for delivery.<br> <p><b>Please read:</b></p>
2. We are currently only shipping to US locations. For international orders, please contact orders@crewsportswear.com if you'd like to place an order.<br> 1. All orders will be batch shipped to your school for pick up.<br>
3. DHL, UPS & USPS shipping delays due to COVID-19. 2. Orders will be batch processed on a weekly basis, please allow 2-3 weeks for delivery.<br>
</div> 3. Masks and gaiters sold on Crew are not intended for medical use. Crew does not make any medical or health claims.<br>
</div> 4. Refunds and exchanges are not allowed due to the hygenic nature of the product.<br>
@if($store_array[0]->Id == 175)
5. $1 from every item sold will benefit the 2020-2021 Maine South Schoolwide Fundraiser.
@endif
</div>
</div>
@else
<div class="col-md-12">
<div class="alert alert-warning">
<p><b>Please read:</b></p>
1. Items purchased are made on demand. Please allow 2-3 weeks for delivery.<br>
2. We are currently only shipping to US locations. For international orders, please contact orders@crewsportswear.com if you'd like to place an order.<br>
3. DHL, UPS & USPS shipping delays due to COVID-19.
</div>
</div>
@endif
<!-- BEGIN PRODUCTS --> <!-- BEGIN PRODUCTS -->
@foreach($product_array as $i => $product) @foreach($product_array as $i => $product)

4
resources/views/user-layouts/add_item.blade.php
View File

@@ -119,7 +119,9 @@
<option value="toddler">Toddler</option> <option value="toddler">Toddler</option>
<option value="youth">Youth</option> <option value="youth">Youth</option>
<option value="adult">Adult</option> <option value="adult">Adult</option>
<option value="none">None</option> <option value="mask">Mask</option>
<option value="gaiter">Gaiter</option>
<option value="none">None</option>
</select> </select>
<span id="err_available_size"></span> <span id="err_available_size"></span>
</div> </div>

1
resources/views/user-layouts/sell_design.blade.php
View File

@@ -144,6 +144,7 @@
<option value="toddler">Toddler</option> <option value="toddler">Toddler</option>
<option value="youth">Youth</option> <option value="youth">Youth</option>
<option value="adult">Adult</option> <option value="adult">Adult</option>
<option value="mask">Mask</option>
</select> </select>
<span id="err_available_size"></span> <span id="err_available_size"></span>
</div> </div>

2
resources/views/user-layouts/view-store-item.blade.php
View File

@@ -137,6 +137,8 @@
<option value="toddler" @if(in_array("toddler", $available_size)) selected @endif>Toddler</option> <option value="toddler" @if(in_array("toddler", $available_size)) selected @endif>Toddler</option>
<option value="youth" @if(in_array("youth", $available_size)) selected @endif>Youth</option> <option value="youth" @if(in_array("youth", $available_size)) selected @endif>Youth</option>
<option value="adult" @if(in_array("adult", $available_size)) selected @endif>Adult</option> <option value="adult" @if(in_array("adult", $available_size)) selected @endif>Adult</option>
<option value="mask" @if(in_array("mask", $available_size)) selected @endif>Mask</option>
<option value="gaiter" @if(in_array("gaiter", $available_size)) selected @endif>Gaiter</option>
<option value="none" @if(in_array("none", $available_size)) selected @endif>None</option> <option value="none" @if(in_array("none", $available_size)) selected @endif>None</option>
</select> </select>
<span id="err_available_size"></span> <span id="err_available_size"></span>