Subversion Repositories SmartDukaan

Rev

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

Rev 4277 Rev 4280
Line 136... Line 136...
136
				#else
136
				#else
137
				<td>N/A</td>
137
				<td>N/A</td>
138
				#end
138
				#end
139
                <td class="truncated-text-for-order-table">$payment.getGatewayId()</td>
139
                <td class="truncated-text-for-order-table">$payment.getGatewayId()</td>
140
                <td>$payment.getAmount()</td>
140
                <td>$payment.getAmount()</td>
141
                <td ><input id="block-payment" type="button" transactionId="$payment.getMerchantTxnId()" currentAgent="$action.getCurrentAgentEmailId()" ticketId="$ticketId" value="Block Payment" class="CODButton"/> </td>
141
                <td class="center-aligned"><input id="block-payment" type="button" transactionId="$payment.getMerchantTxnId()" currentAgent="$action.getCurrentAgentEmailId()" ticketId="$ticketId" value="Block Payment" class="CODButton"/> </td>
142
                <td ><input id="allow-payment" type="button" transactionId="$payment.getMerchantTxnId()" ticketId="$ticketId" value="Allow Payment" class="CODButton"/> </td>
142
                <td class="center-aligned"><input id="allow-payment" type="button" transactionId="$payment.getMerchantTxnId()" ticketId="$ticketId" value="Allow Payment" class="CODButton"/> </td>
143
            </tr>
143
            </tr>
144
            #end
144
            #end
145
        </tbody>
145
        </tbody>
146
    </table>
146
    </table>
147
</div>
147
</div>
Line 187... Line 187...
187
                <td>$order.getTotal_amount()</td>
187
                <td>$order.getTotal_amount()</td>
188
                <td>$order.getCustomer_mobilenumber()</td>
188
                <td>$order.getCustomer_mobilenumber()</td>
189
                <td class="truncated-text-for-order-table">$action.getAddress($order)</td>
189
                <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>
190
                <td class="truncated-text-for-order-table">$action.convertDate($order.getExpected_delivery_time())</td>
191
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
191
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
192
                <td ><input type="button" value="Verify COD" ticketId="$ticketId" orderId="$orderId" orderStatus="SUBMITTED_FOR_PROCESSING" class="update-order-status CODButton"/> </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>
193
                <td ><input type="button" value="Cancel order" ticketId="$ticketId" orderId="$orderId" orderStatus="CANCELED" class="display-cancel-order-popup CODButton"/> </td>
193
                <td class="center-aligned"><input type="button" value="Cancel order" ticketId="$ticketId" orderId="$orderId" orderStatus="CANCELED" class="display-cancel-order-popup CODButton"/> </td>
194
				#elseif($ticket.getCategory().name().equals("ORDER_CANCELLATION"))
194
				#elseif($ticket.getCategory().name().equals("ORDER_CANCELLATION"))
195
				<td ><input type="button" value="Confirm" ticketId="$ticketId" orderId="$orderId" orderStatus="CANCEL_REQUEST_CONFIRMED" class="update-order-status CODButton"/> </td>
195
				<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 ><input type="button" value="Deny" ticketId="$ticketId" orderId="$orderId" orderStatus="DENY_CANCEL_REQUEST" 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>
197
                #elseif($ticket.getCategory().name().equals("DELAYED_DELIVERY"))
197
                #elseif($ticket.getCategory().name().equals("DELAYED_DELIVERY"))
198
                <td class="truncated-text-for-order-table">$action.convertDate($order.getPromised_delivery_time())</td>
198
                <td class="truncated-text-for-order-table">$action.convertDate($order.getPromised_delivery_time())</td>
199
                <td class="truncated-text-for-order-table">$order.getDelayReason().name()</td>
199
                <td class="truncated-text-for-order-table">$order.getDelayReason().name()</td>
200
                #end
200
                #end
201
            </tr>
201
            </tr>