update 11_4_2019

app/Http/Controllers/designer/DesignerController.php

@@ -252,7 +252,12 @@ class DesignerController extends Controller {
 		$templateCode 			= 	$post['templateCode'];
 		
 		$default_template_color_array    		=   $newDesignerModel->selectDefaultTemplateColor($templateCode);
-		echo json_encode($default_template_color_array);
+		// var_dump($default_template_color_array);
+		
+		return response()->json(array(
+			'success' => true,
+			'default_template_color_array' => $default_template_color_array
+		));
 		
 	}
 

app/Http/Controllers/paypal/PaypalController.php

@@ -114,7 +114,7 @@ class PaypalController extends Controller {
 
 		// $tax_value = 0.10;
 		
-		if($grouped_item[0]->StoreId == 76){
+		if($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78){
 			$tax_value = 0;
 		}else{
 			$tax_value = 0.10;

app/Http/Controllers/user/UserController.php

@@ -959,13 +959,13 @@ class UserController extends Controller {
 	function showStoreOrderDetails(Request $request){
 
 		$post 					=	$request->all();
+		// var_dump($post['pid']);
 		$UserModel				= new UserModel;
 		$array_payment_details 	= $UserModel->selectPaymentDetails('CartKey', $post['ck']);
 		$array_shipping_add 	= $UserModel->selectShippingAddress('PaymentDetail_Id', $array_payment_details[0]->Id);
 		
 		$array_thumbnail_display = $UserModel->selectDisplayItemThumbById($post['pid']);
 		$array_item = $UserModel->selectOrder('Id', $post['id']);
-		
 		$handle_order_detail_body = view('user-layouts.order-details-body')
 												->with('array_payment_details', $array_payment_details)
 												->with('array_shipping_add', $array_shipping_add)

app/Models/designer/DesignerModel.php

@@ -42,8 +42,7 @@ class DesignerModel extends Model {
 		
 		$pdo = DB::connection()->getPdo();
 		$query	=	$pdo->prepare("SELECT NULL AS RGBIndex, RGBColor AS default_Color, DisplayName FROM template_body_colors WHERE TemplateCode = '$templateCode' UNION SELECT TrimNumber, RGBColor AS default_Color, DisplayName FROM template_trim_colors WHERE TemplateCode = '$templateCode'");
-		$query->execute();//$query->execute(array($bindings ));
+		$query->execute();
-		// $row=$query->fetch(\PDO::FETCH_OBJ);
 		
 		while($row=$query->fetch(\PDO::FETCH_OBJ)) {
 			if($row->RGBIndex == NULL){

app/Models/user/UserModel.php

@@ -161,7 +161,7 @@ class UserModel extends Model {
 	}
 
 	function selectStoreOrders($store_id){
-		$i = DB::table('orders')->select('orders.*',  'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*')
+		$i = DB::table('orders')->select('orders.*', 'orders.Id as Order_Id', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*')
 						->leftjoin('payment_details', 'payment_details.CartKey','=','orders.CartKey')
 						->leftjoin('shipping_addresses', 'shipping_addresses.PaymentDetail_Id','=','payment_details.Id')
 						->where('orders.StoreId', $store_id)	

resources/views/designer/designer.blade.php

@@ -445,7 +445,7 @@
                                                 </div>
                                             </div>
 
-                                            @if($template->Type == "Shirts")
+                                            <!-- @if($template->Type == "Shirts")
                                                 @if($i == 1)
                                                     <h4>Right Sleeve</h4>	
                                                 @endif
@@ -460,9 +460,9 @@
 
                                             @else
                                                 <h4>Trim {{ $i }}</h4>	
-                                            @endif
+                                            @endif -->
 
-                                            <!-- <h4 id="h4_Trim_{{ $i }}">Trim {{ $i }}</h4>				 -->
+                                            <h4 id="h4_Trim_{{ $i }}">Trim {{ $i }}</h4>				
                                             <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><a href="#tab_trimpattern{{ $i }}" data-toggle="pill">Pattern</a></li>
@@ -1629,28 +1629,43 @@
                             xhr.setRequestHeader( 'X-Requested-With',  'XMLHttpRequest');
                     },
                     success: function(response) {
-                        // console.log(response);
+                        // console.log(response.default_template_color_array);
-                        var objColor = jQuery.parseJSON(response);
+
-                        for (var i = 0; i < objColor.length; i++){
+                        // for (var [key, value] of Object.entries(response.default_template_color_array)) {
-                        	for (var key in objColor[i]) {
+                            console.log(response.default_template_color_array);
-                        		if(key == "default_mainColor"){
+                            response.default_template_color_array.forEach(function(value, key){
-                        			$("#mainColor").spectrum("set", objColor[i][key]);
+                                var colors_array = value;
+                                console.log(colors_array);
+                                if(key == 0){
+                                    // console.log(colors_array['default_mainColor'])
+                                    $("#mainColor").spectrum("set", colors_array['default_mainColor']);
                                 }else{
-                                    
+                                    if(colors_array['h4_Trim_'+key] != null){
-                        			$("input#Trim_"+key+".trimColor").spectrum("set", objColor[i][key]);
+                                        $('#h4_Trim_'+key).html(colors_array['h4_Trim_'+key]);
-                                    
+                                    }else{
-                                    if(objColor[i][key] != null){
+                                        $('#h4_Trim_'+key).html(colors_array['Trim '+ key]);
-                                        console.log( objColor[i][key]);
-                                        // $().html()
                                     }
 
-                                    // for(var k in objColor[i][']){
+                                }
+                                // console.log(colors_array['h4_Trim_'+key])
+                                // colors_array.forEach(function(v){
+                                //     console.log(v, k);
+                                // })
                                 
+                            });
+                        // }
+                        // var objColor = jQuery.parseJSON(response);
+                        // for (var i = 0; i < objColor.length; i++){
+                        // 	for (var key in objColor[i]) {
+                        // 		if(key == "default_mainColor"){
+                        // 			$("#mainColor").spectrum("set", objColor[i][key]);
+                        // 		}else{
+                                    
+                        // 			$("input#Trim_"+key+".trimColor").spectrum("set", objColor[i][key]);
+                        // 			colorPickerCustom();
+                        // 		}
+                        // 	}
                         // }
-                        			colorPickerCustom();
-                        		}
-                        	}
-                        }
                     }
                     
                 });

resources/views/teamstore-sublayouts/index.blade.php

@@ -164,10 +164,10 @@
                         <h4 class="text-center product-name-holder">{{ $product->ProductName }}</h4>
                         <hr class="line">
                         <div class="row">
-                            <div class="col-md-6 col-sm-6">
+                            <div class="col-md-7 col-sm-7">
                                 <p class="price">{{ $product->ProductPrice }} <small style="font-size: 15px;"> {{ $store_array[0]->StoreCurrency }}</small></p>
                             </div>
-                            <div class="col-md-6 col-sm-6">
+                            <div class="col-md-5 col-sm-5">
                                 <a href="{{ url('teamstore') }}/{{ $store_array[0]->StoreUrl }}/product/{{ $product->ProductURL }}" class="btn btn-success right" > View Details</a>
                             </div>
                             

resources/views/user-layouts/store-orders.blade.php

@@ -47,6 +47,7 @@
                                         <input type="text" name="max" class="form-control datepicker-reports" id="max" placeholder="Select Date" required autocomplete="off"/>
                                     </div>
                                 </div>
+                                <!-- {{ var_dump($array_store_orders) }} -->
                                 <div class="col-md-12">
                                     <table class="table table-bordered table-condensed nowrap" id="tbl_store_orders">
                                         <thead>
@@ -72,7 +73,7 @@
                                         <tbody>
                                             @foreach($array_store_orders as $item_order)
                                                 <tr>
-                                                    <td>{{ $item_order->InvoiceNumber }}</td>
+                                                    <td>{{ $item_order->InvoiceNumber . ' - ' . $item_order->Order_Id }}</td>
                                                     <td>{{ $item_order->ProductName }}</td>
                                                     <td>{{ $item_order->Price . ' ' .  $item_order->Currency }}</td>
                                                     <td>{{ $item_order->Quantity }} </td>
@@ -88,7 +89,7 @@
                                                     <td>{{ $item_order->country_code  }} </td>
                                                     <td>{{ date('F j, Y g:i a', strtotime($item_order->DateCreated)) }}</td>
                                                     <td class="text-center">
-                                                        <a href="#" data-pid="{{ $item_order->ProductId }}" data-id="{{ $item_order->Id }}"  data-ck="{{ $item_order->CartKey }}" class="btn btn-default btn-xs btn-order-item-details">View Details</a>
+                                                        <a href="#" data-pid="{{ $item_order->ProductId }}" data-id="{{ $item_order->Order_Id }}"  data-ck="{{ $item_order->CartKey }}" class="btn btn-default btn-xs btn-order-item-details">View Details</a>
                                                     </td>
                                                 </tr>
                                             @endforeach

resources/views/user-layouts/store_items.blade.php

@@ -44,6 +44,7 @@
                                             <a href="{{ url('user/store-items/add-item') }}" type="button" class="btn btn-primary">
                                                 <i class="fa fa-plus"></i> Add new Item
                                             </a>
+                                            <button class="btn btn-primary"><i class="fa fa-exchange"></i> Re-arrange item</button>
                                         </div>
                                     </div>
                                   <!-- BEGIN PRODUCTS -->

resources/views/user-layouts/user_template.blade.php

@@ -1455,6 +1455,8 @@
 					var getsportName = $(this).val();
 					getsportName = getsportName.replace(/\s+/g, '-').toLowerCase(); //new object assigned to var str
 					$("#product_url").val(getsportName);
+					// /[\/]/g matches forward slashes.
+					// /[\\]/g matches backward slashes.
 				});
 
 				$('#list').click(function(event){event.preventDefault();$('#products .item').addClass('list-group-item');});