From 051d1ec5c98da32b35a9bfbb58305194798ffad8 Mon Sep 17 00:00:00 2001
From: franknstayn <frank.begornia@yahoo.com>
Date: Thu, 19 Mar 2020 22:39:07 +0800
Subject: [PATCH] added new form for store item

---
 .../admin_pages/order-details-body.blade.php  | 32 ++++++
 .../views/admin_pages/order_details.blade.php | 36 ++++++-
 .../views/admin_pages/print_order.blade.php   | 98 ++++++++++++-------
 3 files changed, 128 insertions(+), 38 deletions(-)

diff --git a/resources/views/admin_pages/order-details-body.blade.php b/resources/views/admin_pages/order-details-body.blade.php
index 6fc4729..2ee4618 100644
--- a/resources/views/admin_pages/order-details-body.blade.php
+++ b/resources/views/admin_pages/order-details-body.blade.php
@@ -84,6 +84,14 @@
                         <th>Price</th>
                         <th>Quantity</th>
                     </tr>
+                @elseif($array_item[0]->FormUsed=="name-name2-size-form")
+                    <tr>
+                        <th>Gamer Tag</th>
+                        <th>Name</th>
+                        <th>Size</th>
+                        <th>Price</th>
+                        <th>Quantity</th>
+                    </tr>   
                 @elseif($array_item[0]->FormUsed=="name-size-form")
                     <tr>
                         <th>Name</th>
@@ -98,6 +106,14 @@
                         <th>Price</th>
                         <th>Quantity</th>
                     </tr>
+                @elseif($item->FormUsed=="number-jersey-shorts-form")
+                    <tr>
+                        <th>Number</th>
+                        <th>Jersey Size</th>
+                        <th>Shorts Size</th>
+                        <th>Price</th>
+                        <th>Quantity</th>
+                    </tr>
                 @else
 
                 @endif
@@ -148,6 +164,14 @@
                         <td>{{ $array_item[0]->Price }}</td>
                         <td>{{ $array_item[0]->Quantity }}</td>
                     </tr>
+                @elseif($array_item[0]->FormUsed=="name-name2-size-form")
+                    <tr>
+                        <td>{{ $array_item[0]->Name }}</td>
+                        <td>{{ $array_item[0]->Name2 }}</td>
+                        <td>{{ $array_item[0]->Size }}</td>
+                        <td>{{ $array_item[0]->Price }}</td>
+                        <td>{{ $array_item[0]->Quantity }}</td>
+                    </tr>
                 @elseif($array_item[0]->FormUsed=="name-size-form")
                     <tr>
                         <td>{{ $array_item[0]->Name }}</td>
@@ -162,6 +186,14 @@
                         <td>{{ $array_item[0]->Price }}</td>
                         <td>{{ $array_item[0]->Quantity }}</td>
                     </tr>
+                @elseif($array_item[0]->FormUsed=="number-jersey-shorts-form")
+                    <tr>
+                        <td>{{ $array_item[0]->Number }}</td>
+                        <td>{{ $array_item[0]->JerseySize }}</td>
+                        <td>{{ $array_item[0]->ShortsSize }}</td>
+                        <td>{{ $array_item[0]->Price  }}</td>
+                        <td>{{ $array_item[0]->Quantity }}</td>
+                    </tr>
                 @else
                 
 
diff --git a/resources/views/admin_pages/order_details.blade.php b/resources/views/admin_pages/order_details.blade.php
index 1986b14..bae4999 100644
--- a/resources/views/admin_pages/order_details.blade.php
+++ b/resources/views/admin_pages/order_details.blade.php
@@ -114,7 +114,6 @@
                                                                     <th>Price</th>
                                                                     <th>Quantity</th>
                                                                     <th></th>
-                                                                    <!-- <th></th> -->
                                                                 </tr>
                                                             @elseif($item->FormUsed=="tshirt-form")
                                                                 <tr>
@@ -122,7 +121,6 @@
                                                                     <th>Price</th>
                                                                     <th>Quantity</th>
                                                                     <th></th>
-                                                                   
                                                                 </tr>
 
                                                             @elseif($item->FormUsed=="quantity-form")
@@ -147,7 +145,15 @@
                                                                     <th>Price</th>
                                                                     <th>Quantity</th>
                                                                     <th></th>
-                                                                </tr>                            
+                                                                </tr>
+                                                            @elseif($item->FormUsed=="name-name2-size-form")
+                                                                <tr>
+                                                                    <th>Gamer Tag</th>
+                                                                    <th>Name</th>
+                                                                    <th>Size</th>
+                                                                    <th>Price</th>
+                                                                    <th>Quantity</th>
+                                                                </tr>              
                                                             @elseif($item->FormUsed=="number-form")
                                                                 <tr>
                                                                     <th>Number</th>
@@ -168,6 +174,14 @@
                                                                     <th>Price</th>
                                                                     <th>Quantity</th>
                                                                 </tr>
+                                                            @elseif($item->FormUsed=="number-jersey-shorts-form")
+                                                                <tr>
+                                                                    <th>Number</th>
+                                                                    <th>Jersey Size</th>
+                                                                    <th>Shorts Size</th>
+                                                                    <th>Price</th>
+                                                                    <th>Quantity</th>
+                                                                </tr>
                                                             @else
 
                                                             @endif
@@ -226,6 +240,14 @@
                                                                             <td>{{ $sub_item->Price }}</td>
                                                                             <td>{{ $sub_item->Quantity }}</td>
                                                                         </tr>
+                                                                    @elseif($item->FormUsed=="name-name2-size-form")
+                                                                        <tr>
+                                                                            <td>{{ $sub_item->Name }}</td>
+                                                                            <td>{{ $sub_item->Name2 }}</td>
+                                                                            <td>{{ $sub_item->Size }}</td>
+                                                                            <td>{{ $sub_item->Price }}</td>
+                                                                            <td>{{ $sub_item->Quantity }}</td>
+                                                                        </tr>
                                                                     @elseif($item->FormUsed=="name-size-form")
                                                                         <tr>
                                                                             <td>{{ $sub_item->Name }}</td>
@@ -240,6 +262,14 @@
                                                                             <td>{{ $sub_item->Price }}</td>
                                                                             <td>{{ $sub_item->Quantity }}</td>
                                                                         </tr>
+                                                                    @elseif($item->FormUsed=="number-jersey-shorts-form")
+                                                                        <tr>
+                                                                            <td>{{ $sub_item->Number }}</td>
+                                                                            <td>{{ $sub_item->JerseySize }}</td>
+                                                                            <td>{{ $sub_item->ShortsSize }}</td>
+                                                                            <td>{{ $sub_item->Price  }}</td>
+                                                                            <td>{{ $sub_item->Quantity }}</td>
+                                                                        </tr>
                                                                     @else
 
                                                                     @endif
diff --git a/resources/views/admin_pages/print_order.blade.php b/resources/views/admin_pages/print_order.blade.php
index dcf2d35..d4d358f 100644
--- a/resources/views/admin_pages/print_order.blade.php
+++ b/resources/views/admin_pages/print_order.blade.php
@@ -464,42 +464,56 @@
                                                         </tr>
 
                                                     @elseif($item->FormUsed=="name-number-form")
-                                                        <tr>
-                                                            <td><b>Name</b></td>
-                                                            <td><b>Number</b></td>
-                                                            <!-- <td><b>Price</b></td> -->
-                                                            <td><b>Quantity</b></td>
-                                                        </tr>
-													
-                                                        @elseif($item->FormUsed=="name-number-size-form")
-                                                          <tr>
-                                                            <th>Name</th>
-                                                            <th>Number</th>
-                                                            <th>Size</th>
-                                                            <!-- <th>Price</th> -->
-                                                            <th>Quantity</th>
-                                                          </tr>
+                                                      <tr>
+                                                          <td><b>Name</b></td>
+                                                          <td><b>Number</b></td>
+                                                          <!-- <td><b>Price</b></td> -->
+                                                          <td><b>Quantity</b></td>
+                                                      </tr>
+                      
+                                                    @elseif($item->FormUsed=="name-number-size-form")
+                                                      <tr>
+                                                        <th>Name</th>
+                                                        <th>Number</th>
+                                                        <th>Size</th>
+                                                        <!-- <th>Price</th> -->
+                                                        <th>Quantity</th>
+                                                      </tr>
 
-                                                        @elseif($item->FormUsed=="number-form")
-                                                            <tr>
-                                                              <th>Number</th>
-                                                              <!-- <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>
-                                                            </tr>
-                                                        @elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
-                                                            <tr>
-                                                              <th>Jersey Size</th>
-                                                              <th>Shorts Size</th>
-                                                              {{-- <th>Price</th> --}}
-                                                              <th>Quantity</th>
-                                                            </tr>
+                                                    @elseif($item->FormUsed=="number-form")
+                                                        <tr>
+                                                          <th>Number</th>
+                                                          <!-- <th>Price</th> -->
+                                                          <th>Quantity</th>
+                                                        </tr>
+                                                    @elseif($item->FormUsed=="name-name2-size-form")
+                                                      <tr>
+                                                        <th>Gamer Tag</th>
+                                                        <th>Name</th>
+                                                        <th>Size</th>
+                                                        <th>Quantity</th>
+                                                      </tr>
+                                                    @elseif($item->FormUsed=="name-size-form")
+                                                        <tr>
+                                                          <th>Name</th>
+                                                          <th>Size</th>
+                                                          {{-- <th>Price</th> --}}
+                                                          <th>Quantity</th>
+                                                        </tr>
+                                                    @elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
+                                                        <tr>
+                                                          <th>Jersey Size</th>
+                                                          <th>Shorts Size</th>
+                                                          {{-- <th>Price</th> --}}
+                                                          <th>Quantity</th>
+                                                        </tr>
+                                                    @elseif($item->FormUsed=="number-jersey-shorts-form")
+                                                      <tr>
+                                                          <td><b>Number</b></td>
+                                                          <td><b>Jersey Size</b></td>
+                                                          <td><b>Shorts Size</b></td>
+                                                          <td><b>Quantity</b></td>
+                                                      </tr>
                                                     @else
 
                                                     @endif
@@ -553,6 +567,13 @@
                                                                 <!-- <td>{{ $sub_item->Price }}</td> -->
                                                                 <td>{{ $sub_item->Quantity }}</td>
                                                               </tr>
+                                                            @elseif($item->FormUsed=="name-name2-size-form")
+                                                              <tr>
+                                                                <td>{{ $sub_item->Name }}</td>
+                                                                <td>{{ $sub_item->Name2 }}</td>
+                                                                <td>{{ $sub_item->Size }}</td>
+                                                                <td>{{ $sub_item->Quantity }}</td>
+                                                              </tr>
                                                             @elseif($item->FormUsed=="name-size-form")
                                                               <tr>
                                                                 <td>{{ $sub_item->Name }}</td>
@@ -568,6 +589,13 @@
                                                                 {{-- <td>{{ $sub_item->Price }}</td> --}}
                                                                 <td>{{ $sub_item->Quantity }}</td>
                                                               </tr>
+                                                            @elseif($item->FormUsed=="number-jersey-shorts-form")
+                                                              <tr>
+                                                                  <td>{{ $sub_item->Number }}</td>
+                                                                  <td>{{ $sub_item->JerseySize }}</td>
+                                                                  <td>{{ $sub_item->ShortsSize }}</td>
+                                                                  <td>{{ $sub_item->Quantity }}</td>
+                                                              </tr>
                                                             @else
 
                                                             @endif