Subversion Repositories SmartDukaan

Rev

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

Rev 5521 Rev 5791
Line 162... Line 162...
162
                <th>Expected delivery</th>
162
                <th>Expected delivery</th>
163
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
163
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
164
				<th>Trust Level</th>	
164
				<th>Trust Level</th>	
165
                <th></th>
165
                <th></th>
166
                <th></th>
166
                <th></th>
-
 
167
				#elseif($ticket.getCategory().name().equals("STORE_PICKUP"))
-
 
168
				<th>Pickup Expiry</th>	
-
 
169
                <th></th>
-
 
170
                <th></th>
167
				#elseif($ticket.getCategory().name().equals("ORDER_CANCELLATION") || $ticket.getCategory().name().equals("DOA_RECEIVED") || $ticket.getCategory().name().equals("RETURN_FORM"))
171
				#elseif($ticket.getCategory().name().equals("ORDER_CANCELLATION") || $ticket.getCategory().name().equals("DOA_RECEIVED") || $ticket.getCategory().name().equals("RETURN_FORM"))
168
				<th></th>
172
				<th></th>
169
                <th></th>
173
                <th></th>
170
                #elseif($ticket.getCategory().name().equals("DELAYED_DELIVERY"))
174
                #elseif($ticket.getCategory().name().equals("DELAYED_DELIVERY"))
171
                <th>Promised delivery</th>
175
                <th>Promised delivery</th>
Line 206... Line 210...
206
				<td class="center-aligned"><input id="deny-doa" type="button" value="Deny" ticketId="$ticketId" orderId="$orderId" class="CODButton"/> </td>
210
				<td class="center-aligned"><input id="deny-doa" type="button" value="Deny" ticketId="$ticketId" orderId="$orderId" class="CODButton"/> </td>
207
                <td class="center-aligned"><input id="authorize-doa" type="button" value="Authorize" ticketId="$ticketId" orderId="$orderId"class="CODButton"/> </td>
211
                <td class="center-aligned"><input id="authorize-doa" type="button" value="Authorize" ticketId="$ticketId" orderId="$orderId"class="CODButton"/> </td>
208
				#elseif($ticket.getCategory().name().equals("DELAYED_DELIVERY"))
212
				#elseif($ticket.getCategory().name().equals("DELAYED_DELIVERY"))
209
                <td class="truncated-text-for-order-table">$action.convertDate($order.getPromised_delivery_time())</td>
213
                <td class="truncated-text-for-order-table">$action.convertDate($order.getPromised_delivery_time())</td>
210
                <td class="truncated-text-for-order-table">$order.getDelayReason().name()</td>
214
                <td class="truncated-text-for-order-table">$order.getDelayReason().name()</td>
-
 
215
				#elseif($ticket.getCategory().name().equals("STORE_PICKUP"))
-
 
216
				<td class="center-aligned truncated-text-for-order-table">$action.getPickupExpiryDate($orderId, $order.getDelivery_timestamp())</td>
-
 
217
				<td class="center-aligned" id="pickupExtensionContainer">
-
 
218
					<select id="pickupExtension" name="pickupExtension" class="pickupExtension" style="width:50px">
-
 
219
                            <option value="0" selected="selected">0</option>
-
 
220
                            <option value="1">1</option>
-
 
221
							<option value="2">2</option>
-
 
222
							<option value="3">3</option>
-
 
223
							<option value="4">4</option>
-
 
224
							<option value="5">5</option>
-
 
225
					</select>
-
 
226
				</td>
-
 
227
				<td class="center-aligned"><input type="button" value="Extend" orderId="$orderId" class="extend-expiry CODButton"/> </td>
211
				
228
				
212
                #end
229
                #end
213
            </tr>
230
            </tr>
214
            #end
231
            #end
215
        </tbody>
232
        </tbody>