Subversion Repositories SmartDukaan

Rev

Rev 3711 | Rev 3998 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 3711 Rev 3853
Line 56... Line 56...
56
                <tr >
56
                <tr >
57
                    <td >Customer Name: </td>
57
                    <td >Customer Name: </td>
58
                    <td >$user.getName()</td>
58
                    <td >$user.getName()</td>
59
                    <td ></td>
59
                    <td ></td>
60
                    <td >Customer Mobile No: </td>
60
                    <td >Customer Mobile No: </td>
-
 
61
                    <td >
-
 
62
                        #if($user.isSetMobileNumber())
61
                    <td >$user.getMobileNumber()</td>
63
                            $user.getMobileNumber()
-
 
64
                        #else
-
 
65
                            N/A
-
 
66
                        #end
-
 
67
                    </td>
62
                </tr>
68
                </tr>
63
            #else
69
            #else
64
                <tr >
70
                <tr >
65
                    <td >Customer Name: </td>
71
                    <td >Customer Name: </td>
66
                    <td >
72
                    <td >
Line 202... Line 208...
202
            <tr>
208
            <tr>
203
                <th>Order Id</th>
209
                <th>Order Id</th>
204
                <th>Product</th>
210
                <th>Product</th>
205
                <th>Created</th>
211
                <th>Created</th>
206
                <th>Amount</th>
212
                <th>Amount</th>
-
 
213
                <th>Mobile No</th>
207
                <th>Shipping Address</th>
214
                <th>Shipping Address</th>
208
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
215
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
209
                <th>Expected delivery</th>
216
                <th>Expected delivery</th>
210
                <th></th>
217
                <th></th>
211
                <th></th>
218
                <th></th>
Line 226... Line 233...
226
                    </a>
233
                    </a>
227
                </td>
234
                </td>
228
                <td class="truncated-text-for-order-table">$action.getProductName($order.getLineitems().get(0))</td>
235
                <td class="truncated-text-for-order-table">$action.getProductName($order.getLineitems().get(0))</td>
229
                <td class="truncated-text-for-order-table">$action.convertDate($order.getCreated_timestamp())</td>
236
                <td class="truncated-text-for-order-table">$action.convertDate($order.getCreated_timestamp())</td>
230
                <td>$order.getTotal_amount()</td>
237
                <td>$order.getTotal_amount()</td>
-
 
238
                <td>$order.getCustomer_mobilenumber()</td>
231
                <td class="truncated-text-for-order-table" title="$action.getAddress($order)">$order.getCustomer_city()</td>
239
                <td class="truncated-text-for-order-table" title="$action.getAddress($order)">$order.getCustomer_city()</td>
232
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
240
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
233
                <td class="truncated-text-for-order-table">$action.convertDate($order.getExpected_delivery_time())</td>
241
                <td class="truncated-text-for-order-table">$action.convertDate($order.getExpected_delivery_time())</td>
234
                <td ><input type="button" value="COD verified" ticketId="$ticketId" orderId="$orderId" orderStatus="SUBMITTED_FOR_PROCESSING" class="update-order-status"/> </td>
242
                <td ><input type="button" value="COD verified" ticketId="$ticketId" orderId="$orderId" orderStatus="SUBMITTED_FOR_PROCESSING" class="update-order-status"/> </td>
235
                <td ><input type="button" value="Cancel order" ticketId="$ticketId" orderId="$orderId" orderStatus="CANCELED" class="update-order-status"/> </td>
243
                <td ><input type="button" value="Cancel order" ticketId="$ticketId" orderId="$orderId" orderStatus="CANCELED" class="update-order-status"/> </td>