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

update_5_2_2019

Browse Source
This commit is contained in:
Frank John Begornia
2019-05-02 22:45:44 +08:00
parent c982366dbd
commit c39fb0a2a4
10 changed files with 114 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,12 +120,24 @@ class TeamStoreController extends Controller {
$teams_array = $m->getTeams($product_array[0]->Id); $teams_array = $m->getTeams($product_array[0]->Id);
$sizes_array = $m->getSizes(); $sizes_array = $m->getSizes();
if($product_array[0]->ProductAvailableQty != null){
$soldQty = $m->getSoldQty($product_array[0]->Id);
// var_dump($soldQty);
// echo $product_array[0]->ProductAvailableQty;
$availableQty = $product_array[0]->ProductAvailableQty - $soldQty[0]->SoldQty;
}else{
// echo 'no qty';
$availableQty = null;
}
// $product_array[0]->ProductAvailableQty
return view('teamstore-sublayouts.product-details') return view('teamstore-sublayouts.product-details')
->with('store_array', $store_array) ->with('store_array', $store_array)
->with('product_array', $product_array) ->with('product_array', $product_array)
->with('thumbnails_array', $thumbnails_array) ->with('thumbnails_array', $thumbnails_array)
->with('teams_array', $teams_array) ->with('teams_array', $teams_array)
->with('sizes_array', $sizes_array); ->with('sizes_array', $sizes_array)
->with('available_qty', $availableQty);
} }

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

@@ -135,4 +135,12 @@ class TeamStoreModel extends Model {
return $i; return $i;
} }
function getSoldQty($productId){
$i = DB::table('orders')->select(DB::raw('SUM(Quantity) AS SoldQty'))
->where('ProductId', $productId)
->get();
return $i;
}
} }

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

@@ -387,7 +387,20 @@
<hr style="margin-top: 10px; margin-bottom: 1px;"> <hr style="margin-top: 10px; margin-bottom: 1px;">
</div> </div>
</div> </div>
@if($template->Type == "Shirts")
@if($i == 1)
<h4>Neck Line</h4>
@endif
@if($i == 2)
<h4>Sleeves</h4>
@endif
@else
<h4>Trim {{ $i }}</h4> <h4>Trim {{ $i }}</h4>
@endif
<ul class="nav nav-pills nav-stacked col-md-4"> <ul class="nav nav-pills nav-stacked col-md-4">
<li class="active"><a href="#tab_trim_basecolor{{ $i }}" data-toggle="pill">Base Color</a></li> <li class="active"><a href="#tab_trim_basecolor{{ $i }}" data-toggle="pill">Base Color</a></li>
<li><a href="#tab_trimpattern{{ $i }}" data-toggle="pill">Pattern</a></li> <li><a href="#tab_trimpattern{{ $i }}" data-toggle="pill">Pattern</a></li>
@@ -1476,7 +1489,7 @@
canvas = window[$(this).attr('data-canvas-id')]; canvas = window[$(this).attr('data-canvas-id')];
canvasID = $(this).attr('data-canvas-id'); canvasID = $(this).attr('data-canvas-id');
canvas.calcOffset(); canvas.calcOffset();
initCanvas(); // initCanvas();
}); });
//trigger enter ###################################################################### //trigger enter ######################################################################
@@ -1738,14 +1751,14 @@
var fontprop = getFontDisplay(obj.fontFamily); var fontprop = getFontDisplay(obj.fontFamily);
console.log(fontprop) console.log(fontprop)
// $('.btn-show-fonts').html(fontprop.fontNameDisplay); $('.btn-show-fonts').html(fontprop.fontNameDisplay);
// $('.btn-show-fonts').css('font-family', obj.fontFamily); $('.btn-show-fonts').css('font-family', obj.fontFamily);
// $('.btn-show-fonts').attr('data-font-size', fontprop.additionalSize); $('.btn-show-fonts').attr('data-font-size', fontprop.additionalSize);
// $(".text-font-size").val((obj.fontSize / $(".btn-show-fonts").attr('data-font-size')).toFixed(2)); $(".text-font-size").val((obj.fontSize / $(".btn-show-fonts").attr('data-font-size')).toFixed(2));
$('#reverse').prop('checked', obj.get('reverse')); // $('#reverse').prop('checked', obj.get('reverse'));
$('#radius').val(obj.get('radius')); // $('#radius').val(obj.get('radius'));
$('#spacing').val(obj.get('spacing')); // $('#spacing').val(obj.get('spacing'));
//$('#fill').val(obj.getFill()); //$('#fill').val(obj.getFill());
//$('#effect').val(obj.getEffect()); //$('#effect').val(obj.getEffect());
@@ -1797,6 +1810,7 @@
} }
setTimeout(function() { setTimeout(function() {
// event.preventDefault();
getClipartProperties(arrayPathId, randomNumbers); getClipartProperties(arrayPathId, randomNumbers);
}, 500); }, 500);
@@ -2999,7 +3013,7 @@
} }
function getClipartProperties(arrayPathId, randomNumbers) { function getClipartProperties(arrayPathId, randomNumbers) {
// console.log(arrayPathId); console.log(arrayPathId);
$.ajax({ //create an ajax request to load_page.php $.ajax({ //create an ajax request to load_page.php
type: "POST", type: "POST",

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

@@ -65,7 +65,7 @@
<div class="text-center"> <div class="text-center">
@foreach($img_thumb as $img) @foreach($img_thumb as $img)
@if($img->ProductId == $item->ProductId) @if($img->ProductId == $item->ProductId)
<img class="previewImage" src="http://{{ config('site_config.prod_private_server_ip') }}/images/{{ $img->Image }}"> <img class="previewImage" src="{{ config('site_config.prod_private_server_ip') }}/images/{{ $img->Image }}">
@endif @endif
@endforeach @endforeach

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

@@ -37,13 +37,22 @@
<span class="glyphicon glyphicon-minus"></span> <span class="glyphicon glyphicon-minus"></span>
</button> </button>
</span> </span>
@if($product_array[0]->ProductAvailableQty == null)
<input type="text" name="quantity" class="form-control input-number" value="1" min="1" max="100"> <input type="text" name="quantity" class="form-control input-number" value="1" min="1" max="100">
@else
<input type="text" name="quantity" class="form-control input-number" value="1" min="1" max="{{ $available_qty }}">
@endif
<span class="input-group-btn"> <span class="input-group-btn">
<button type="button" class="btn btn-default btn-number" data-type="plus" data-field="quantity"> <button type="button" class="btn btn-default btn-number" data-type="plus" data-field="quantity">
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
</button> </button>
</span> </span>
</div> </div>
@if($available_qty != null)
<p>{{ $available_qty }} piece/s available</p>
@endif
</div> </div>
</div> </div>
</div> </div>

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

@@ -80,9 +80,9 @@
padding-top: 20px; padding-top: 20px;
padding-bottom: 20px; padding-bottom: 20px;
@if($store_array[0]->StoreBanner == null) @if($store_array[0]->StoreBanner == null)
background-image: url("{{asset('public/images/teamstore/store-banner-dark.png')}}"); background-image: url("{{ config('site_config.uploads') . 'teamstore/store-banner-dark.png' }}");
@else @else
background-image: url("{{asset('public/images/teamstore') . '/' . $store_array[0]->StoreUrl . '/' . $store_array[0]->StoreBanner }}"); background-image: url("{{ config('site_config.uploads') . 'teamstore/' . $store_array[0]->StoreUrl . '/' . $store_array[0]->StoreBanner }}");
@endif @endif
background-color: #f3f3f3; background-color: #f3f3f3;
background-position: center; background-position: center;

4
resources/views/teamstore-sublayouts/stores.blade.php
View File

@@ -47,12 +47,12 @@
<div style="border: 1px solid #dddddd; padding: 5px;"> <div style="border: 1px solid #dddddd; padding: 5px;">
@if($store->Password != null ) @if($store->Password != null )
<a class="thumbnail password-protected" href="#" data-store-url="{{ $store->StoreUrl }}"> <a class="thumbnail password-protected" href="#" data-store-url="{{ $store->StoreUrl }}">
<img class="store-logo" src="{{asset('public/images/teamstore') . '/' . $store->StoreUrl . '/' . $store->StoreLogo }}"> <img class="store-logo" src="{{ config('site_config.uploads') . 'teamstore/'. $store->StoreUrl . '/' . $store->StoreLogo }}">
</a> </a>
<h4 style="border-top: 1px solid #dddddd; padding: 10px;" class="text-center">{{ $store->StoreName }} <i class="fa fa-lock" title="This store is password protected."></i></h4> <h4 style="border-top: 1px solid #dddddd; padding: 10px;" class="text-center">{{ $store->StoreName }} <i class="fa fa-lock" title="This store is password protected."></i></h4>
@else @else
<a class="thumbnail" href="{{ url('teamstore') . '/' . $store->StoreUrl }}"> <a class="thumbnail" href="{{ url('teamstore') . '/' . $store->StoreUrl }}">
<img class="store-logo" src="{{asset('public/images/teamstore') . '/' . $store->StoreUrl . '/' . $store->StoreLogo }}"> <img class="store-logo" src="{{ config('site_config.uploads') . 'teamstore/' . $store->StoreUrl . '/' . $store->StoreLogo }}">
</a> </a>
<h4 style="border-top: 1px solid #dddddd; padding: 10px;" class="text-center">{{ $store->StoreName }}</h4> <h4 style="border-top: 1px solid #dddddd; padding: 10px;" class="text-center">{{ $store->StoreName }}</h4>
@endif @endif

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

@@ -18,7 +18,7 @@
<!-- Control Sidebar Toggle Button --> <!-- Control Sidebar Toggle Button -->
<li class="user user-menu"> <li class="user user-menu">
<a href="#"> <a href="#">
<img src="{{ asset('/public/images/user/default-user.png') }}" class="user-image" alt="User Image"> <img src="{{ config('site_config.uploads') . 'user/default-user.png' }}" class="user-image" alt="User Image">
<span class="hidden-xs">{{ Auth::user()->username }}</span> <span class="hidden-xs">{{ Auth::user()->username }}</span>
</a> </a>
</li> </li>

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

@@ -4,7 +4,7 @@
<!-- Sidebar user panel --> <!-- Sidebar user panel -->
<div class="user-panel"> <div class="user-panel">
<div class="pull-left image"> <div class="pull-left image">
<img src="{{ asset('/public/images/user/default-user.png') }}" class="img-circle" alt="User Image"> <img src="{{ config('site_config.uploads') . 'user/default-user.png' }}" class="img-circle" alt="User Image">
</div> </div>
<div class="pull-left info"> <div class="pull-left info">
<p>{{ Auth::user()->name }}</p> <p>{{ Auth::user()->name }}</p>

89
resources/views/user-layouts/store_setting.blade.php
View File

@@ -12,23 +12,21 @@
} }
.jumbotron { /* .jumbotron {
padding-top: 20px; padding-top: 20px;
padding-bottom: 20px; padding-bottom: 20px;
background-image: url("{{asset('public/images/teamstore') . '/' . $store_array[0]->StoreUrl . '/' . $store_array[0]->StoreBanner }}"); background-image: url("{{ config('site_config.uploads') . 'teamstore/' . $store_array[0]->StoreUrl . '/' . $store_array[0]->StoreBanner }}");
background-color: #f3f3f3; background-color: #f3f3f3;
background-position: center; background-position: center;
background-size: cover; background-size: cover;
width: 100%; width: 100%;
height: 128px; height: 128px;
} } */
.store-name{ .store-name{
background-color: #ffffff; background-color: #ffffff;
position: absolute; position: absolute;
padding: 10px; padding: 10px;
} }
@media (min-width: 200px) { @media (min-width: 200px) {
@@ -56,6 +54,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
} }
</style> </style>
<div class="content-wrapper" style="min-height: 916px;"> <div class="content-wrapper" style="min-height: 916px;">
<!-- Content Header (Page header) --> <!-- Content Header (Page header) -->
<section class="content-header"> <section class="content-header">
@@ -69,82 +68,58 @@
</ol> </ol>
</section> </section>
<!-- Main content --> <!-- Main content -->
<section class="content"> <section class="content">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<!-- <div class="box box-primary"> --> <div class="box box-primary">
<!-- <div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"> <h3 class="box-title">
Add New Address Current Setting
</h3> </h3>
</div> --> </div>
<div class="nav-tabs-custom">
<ul class="nav nav-tabs">
<li class="active"><a href="#tab_preview" data-toggle="tab" aria-expanded="true">Preview</a></li>
<li class=""><a href="#tab_update_details" data-toggle="tab" aria-expanded="false">Update Details</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab_preview">
<form role="form" id="frm-create-address-book">
<div class="box-body"> <div class="box-body">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-6">
<form role="form">
<div class="box-body">
<div class="form-group"> <div class="form-group">
<label>Store Banner</label> <label>Store Name <button type="button" class="btn btn-link btn-sm"><i class="fa fa-edit"></i> Edit</button></label>
<div class="row"> <p>{{ $store_array[0]->StoreName }}</p>
<div class="col-md-12">
<div class="jumbotron">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label>Store Avatar</label>
<a class="thumbnail" href="#">
<img class="store-logo" src="{{asset('public/images/teamstore') . '/' . $store_array[0]->StoreUrl . '/' . $store_array[0]->StoreLogo }}">
</a>
</div>
<!-- /.box-body -->
</div>
<div class="col-md-8">
<div class="form-group">
<label>Store Name</label>
<h1>{{ $store_array[0]->StoreName }}</h1>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Password Protected</label> <label>Store Password <button type="button" class="btn btn-link btn-sm"><i class="fa fa-edit"></i> Edit</button></label>
@if($store_array[0]->Password != null) @if($store_array[0]->Password != null)
<div class="badge">Yes</div> <div class="badge">Yes</div>
@else @else
<div class="badge">No</div> <p>
<div class="badge">No Password</div>
</p>
@endif @endif
</div> </div>
<div class="form-group">
<label>Store Banner <button type="button" class="btn btn-link btn-sm"><i class="fa fa-edit"></i> Edit</button></label>
<div>
<img src="{{ config('site_config.uploads') . 'teamstore/' . $store_array[0]->StoreUrl . '/' . $store_array[0]->StoreBanner }}" class="img img-responsive">
</div> </div>
</div> </div>
<div class="form-group">
<label>Store Logo <button type="button" class="btn btn-link btn-sm"><i class="fa fa-edit"></i> Edit</button></label>
<div>
<img src="{{ config('site_config.uploads') . 'teamstore/' . $store_array[0]->StoreUrl . '/' . $store_array[0]->StoreLogo }}" width="150px">
</div> </div>
<!-- <div class="box-footer"> </div>
<button type="submit" class="btn btn-primary btn-custom-save">Save</button>
</div> --> </div>
<!-- /.box-body -->
</form> </form>
</div> </div>
<!-- /.tab-pane -->
<div class="tab-pane" id="tab_update_details">
b
</div> </div>
<!-- /.tab-pane -->
</div> </div>
<!-- /.tab-content --> <div class="box-footer">
<button type="submit" class="btn btn-primary">Submit</button>
</div> </div>
<!-- <div> --> <div>
</div> </div>
</div> </div>
</section> </section>