Subversion Repositories SmartDukaan

Rev

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

Rev 4702 Rev 5407
Line 158... Line 158...
158
                <th>Created</th>
158
                <th>Created</th>
159
                <th>Amount</th>
159
                <th>Amount</th>
160
                <th>Mobile No</th>
160
                <th>Mobile No</th>
161
                <th>Shipping Address</th>
161
                <th>Shipping Address</th>
162
                <th>Expected delivery</th>
162
                <th>Expected delivery</th>
163
                #if($ticket.getCategory().name().equals("COD_VERIFICATION") || $ticket.getCategory().name().equals("ORDER_CANCELLATION") || $ticket.getCategory().name().equals("DOA_RECEIVED") || $ticket.getCategory().name().equals("RETURN_FORM"))
163
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
-
 
164
				<th>Trust Level</th>	
-
 
165
                <th></th>
164
                <th></th>
166
                <th></th>
-
 
167
				#elseif($ticket.getCategory().name().equals("ORDER_CANCELLATION") || $ticket.getCategory().name().equals("DOA_RECEIVED") || $ticket.getCategory().name().equals("RETURN_FORM"))
-
 
168
				<th></th>
165
                <th></th>
169
                <th></th>
166
                #elseif($ticket.getCategory().name().equals("DELAYED_DELIVERY"))
170
                #elseif($ticket.getCategory().name().equals("DELAYED_DELIVERY"))
167
                <th>Promised delivery</th>
171
                <th>Promised delivery</th>
168
                <th>Delay reason</th>
172
                <th>Delay reason</th>
169
                #end
173
                #end
Line 187... Line 191...
187
                <td>$order.getTotal_amount()</td>
191
                <td>$order.getTotal_amount()</td>
188
                <td>$order.getCustomer_mobilenumber()</td>
192
                <td>$order.getCustomer_mobilenumber()</td>
189
                <td class="truncated-text-for-order-table">$action.getAddress($order)</td>
193
                <td class="truncated-text-for-order-table">$action.getAddress($order)</td>
190
                <td class="truncated-text-for-order-table">$action.convertDate($order.getExpected_delivery_time())</td>
194
                <td class="truncated-text-for-order-table">$action.convertDate($order.getExpected_delivery_time())</td>
191
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
195
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
-
 
196
                <td class="center-aligned">$action.getCustomerTrustLevel($order.getCustomer_id())</td>
192
                <td class="center-aligned"><input type="button" value="Verify COD" ticketId="$ticketId" orderId="$orderId" orderStatus="SUBMITTED_FOR_PROCESSING" class="update-order-status CODButton"/> </td>
197
                <td class="center-aligned"><input type="button" value="Verify COD" ticketId="$ticketId" orderId="$orderId" orderStatus="SUBMITTED_FOR_PROCESSING" class="update-order-status CODButton"/> </td>
193
                <td class="center-aligned"><input type="button" value="Cancel order" ticketId="$ticketId" orderId="$orderId" orderStatus="COD_VERIFICATION_FAILED" class="display-cancel-order-popup CODButton"/> </td>
198
                <td class="center-aligned"><input type="button" value="Cancel order" ticketId="$ticketId" orderId="$orderId" orderStatus="COD_VERIFICATION_FAILED" class="display-cancel-order-popup CODButton"/> </td>
194
				#elseif($ticket.getCategory().name().equals("ORDER_CANCELLATION"))
199
				#elseif($ticket.getCategory().name().equals("ORDER_CANCELLATION"))
195
				<td class="center-aligned"><input type="button" value="Confirm" ticketId="$ticketId" orderId="$orderId" orderStatus="CANCEL_REQUEST_CONFIRMED" class="update-order-status CODButton"/> </td>
200
				<td class="center-aligned"><input type="button" value="Confirm" ticketId="$ticketId" orderId="$orderId" orderStatus="CANCEL_REQUEST_CONFIRMED" class="update-order-status CODButton"/> </td>
196
                <td class="center-aligned"><input type="button" value="Deny" ticketId="$ticketId" orderId="$orderId" orderStatus="DENY_CANCEL_REQUEST" class="update-order-status CODButton"/> </td>
201
                <td class="center-aligned"><input type="button" value="Deny" ticketId="$ticketId" orderId="$orderId" orderStatus="DENY_CANCEL_REQUEST" class="update-order-status CODButton"/> </td>