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

Merge pull request #5 from franknstayn/local_dev

Browse Source 
Local dev
This commit is contained in:
franknstayn
2019-12-04 18:44:41 +08:00
committed by GitHub
parent 03ea4e84a2 9c371d17be
commit 2e29677b90
9 changed files with 62 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/CustomAuthController.php
View File

@@ -19,6 +19,18 @@ class CustomAuthController extends Controller {
$password = $post['password'];
if (Auth::attempt(['email' => $email, 'password' => $password])){
if (Auth::user()->role == 'admin') {
$message = '
<div class="alert alert-danger alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h4><i class="icon fa fa-ban"></i> ERROR:</h4>
You are not allowed to enter to this site.
</div>';
return response()->json(array('success' => false, 'message'=>$message));
}
$message = "success";
$navbar = view('layout.navbar', compact('view'))->render();
$save_design_button = ' <button type="button" class="btn btn-lg btn-primary pull-right" data-toggle="modal" data-target="#modalDesignName"><i class="fa fa-floppy-o" aria-hidden="true"></i> Save Design</button>';

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

@@ -443,7 +443,7 @@ class TeamStoreController extends Controller {
'Quantity' => 1
);
}
}elseif($product_form == "name-size"){
}elseif($product_form == "name-size-form"){
$order_names = $post['order_names'];
$order_size = $post['order_size'];

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

@@ -468,7 +468,14 @@
<th>Price</th>
<th>Quantity</th>
</tr>
@elseif($item->FormUsed=="name-size-form")
<tr>
<th>Name</th>
<th>Size</th>
<th>Price</th>
<th>Quantity</th>
<th></th>
</tr>
@else
@@ -531,6 +538,13 @@
<td>{{ $sub_item->Price }}</td>
<td>{{ $sub_item->Quantity }}</td>
</tr>
@elseif($item->FormUsed=="name-size-form")
<tr>
<td>{{ $sub_item->Name }}</td>
<td>{{ $sub_item->Size }}</td>
<td>{{ $sub_item->Price }}</td>
<td>{{ $sub_item->Quantity }}</td>
</tr>
@else
@endif

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

@@ -172,7 +172,14 @@
<th>Quantity</th>
<th></th>
</tr>
@elseif($item->FormUsed=="name-size-form")
<tr>
<th>Name</th>
<th>Size</th>
<th>Price</th>
<th>Quantity</th>
<th></th>
</tr>
@else
@endif
@@ -237,6 +244,14 @@
<td>{{ $sub_item->Quantity }}</td>
<td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><span class="glyphicon glyphicon-remove"></span></a></td>
</tr>
@elseif($item->FormUsed=="name-size-form")
<tr>
<td>{{ $sub_item->Name }}</td>
<td>{{ $sub_item->Size }}</td>
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}</td>
<td>{{ $sub_item->Quantity }}</td>
<td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><span class="glyphicon glyphicon-remove"></span></a></td>
</tr>
@else
@endif

0
resources/views/teamstore-sublayouts/forms/name-size.blade.php → resources/views/teamstore-sublayouts/forms/name-size-form.blade.php
View File

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

@@ -99,6 +99,7 @@
<option value="name-number-form">Name and Number Form</option>
<option value="name-number-size-form">Name, Number and Size Form</option>
<option value="number-form">Number Only Form</option>
<option value="name-size-form">Number and Size Form</option>
</select>
</div>
<div class="form-group">

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

@@ -150,6 +150,14 @@
<th>Price</th>
<th>Quantity</th>
</tr>
@elseif($item->FormUsed=="name-size-form")
<tr>
<th>Name</th>
<th>Size</th>
<th>Price</th>
<th>Quantity</th>
<th></th>
</tr>
@else
@endif
@@ -203,6 +211,14 @@
<td>{{ $sub_item->Price . ' ' . $array_payment_details[0]->Currency }}</td>
<td>{{ $sub_item->Quantity }}</td>
</tr>
@elseif($item->FormUsed=="name-size-form")
<tr>
<td>{{ $sub_item->Name }}</td>
<td>{{ $sub_item->Size }}</td>
<td>{{ $sub_item->Price . ' ' . $array_payment_details[0]->Currency }}</td>
<td>{{ $sub_item->Quantity }}</td>
</tr>
@else
@endif

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

@@ -586,8 +586,6 @@
<!-- jQuery 2.2.3 -->
<script src="{{asset('/public/bower_components/AdminLTE/plugins/jQuery/jquery-2.2.3.min.js')}}"></script>
<!-- jQuery UI 1.11.4 -->
<script src="https://code.jquery.com/ui/1.10.4/jquery-ui.min.js"></script>
<!-- Bootstrap 3.3.6 -->
<script src="{{asset('/public/bower_components/AdminLTE/bootstrap/js/bootstrap.min.js')}}"></script>
@@ -615,8 +613,6 @@
<script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js"></script>
<!-- \priceformat -->
<script src="{{asset('/public/designer/js/jquery.priceformat.min.js')}}"></script>
<!-- jquery-ui js -->
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js"></script>
<!-- ekko-lightbox -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/ekko-lightbox/5.3.0/ekko-lightbox.js"></script>
<!-- bootstrap-toggle -->

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

@@ -126,6 +126,7 @@
<option value="name-number-form" @if($product_array[0]->ProductForm == "name-number-form") selected @endif>Name and Number Form</option>
<option value="name-number-size-form" @if($product_array[0]->ProductForm == "name-number-size-form") selected @endif>Name, Number and Size Form</option>
<option value="number-form" @if($product_array[0]->ProductForm == "number-form") selected @endif>Number Only Form</option>
<option value="name-size-form" @if($product_array[0]->ProductForm == "name-size-form") selected @endif>Number and Size Form</option>
</select>
</div>
<div class="form-group">