| Line 57... |
Line 57... |
| 57 |
<th>Order Item Status</th>
|
57 |
<th>Order Item Status</th>
|
| 58 |
<th>Created on</th>
|
58 |
<th>Created on</th>
|
| 59 |
<th>Verified On</th>
|
59 |
<th>Verified On</th>
|
| 60 |
<th>Billed On</th>
|
60 |
<th>Billed On</th>
|
| 61 |
<th>Delivered On</th>
|
61 |
<th>Delivered On</th>
|
| - |
|
62 |
<th>Cancelled On</th>
|
| 62 |
<th>Remarks</th>
|
63 |
<th>Remarks</th>
|
| 63 |
<th>Availability</th>
|
64 |
<th>Availability</th>
|
| 64 |
<th>Verify</th>
|
65 |
<th>Verify</th>
|
| 65 |
<th>Cancel</th>
|
66 |
<th>Cancel</th>
|
| 66 |
|
67 |
|
| Line 102... |
Line 103... |
| 102 |
<td>$request.getBilledTimestamp().format($dateTimeFormatter)</td>
|
103 |
<td>$request.getBilledTimestamp().format($dateTimeFormatter)</td>
|
| 103 |
#else
|
104 |
#else
|
| 104 |
<td></td> #end #if($request.getDeliveredTimestamp())
|
105 |
<td></td> #end #if($request.getDeliveredTimestamp())
|
| 105 |
<td>$request.getDeliveredTimestamp().format($dateTimeFormatter)</td>
|
106 |
<td>$request.getDeliveredTimestamp().format($dateTimeFormatter)</td>
|
| 106 |
#else
|
107 |
#else
|
| - |
|
108 |
<td></td> #end #if($request.getCancelledTimestamp())
|
| - |
|
109 |
<td>$request.getCancelledTimestamp().format($dateTimeFormatter)</td>
|
| - |
|
110 |
#else
|
| 107 |
<td></td> #end #if($request.getStatus() == "CANCELLED")
|
111 |
<td></td> #end #if($request.getStatus() == "CANCELLED")
|
| - |
|
112 |
#if($request.getRemark())
|
| 108 |
<td>$request.getRemark()</td> #else
|
113 |
<td>$request.getRemark()</td> #else
|
| 109 |
<td></td> #end #if($request.getStatus() == "PROCESSING")
|
114 |
<td></td> #end #else
|
| - |
|
115 |
<td></td> #end
|
| 110 |
#if($partnerInventoryMap.get($request.getPendingOrder().getFofoId()).get($request.getItemId()).getAvailability()>0)
|
116 |
#if($partnerInventoryMap.get($request.getPendingOrder().getFofoId()).get($request.getItemId()).getAvailability()>0)
|
| 111 |
<td>$partnerInventoryMap.get($request.getPendingOrder().getFofoId()).get($request.getItemId()).getAvailability()
|
117 |
<td>$partnerInventoryMap.get($request.getPendingOrder().getFofoId()).get($request.getItemId()).getAvailability()
|
| 112 |
</td> #else
|
118 |
</td> #else
|
| 113 |
<td>out of stock</td> #end #else
|
- |
|
| 114 |
<td></td> #end #if($request.getStatus() == "PROCESSING" &&
|
119 |
<td>out of stock</td> #end #if($request.getStatus() ==
|
| 115 |
!$request.getVerifiedTimestamp())
|
120 |
"PROCESSING" && !$request.getVerifiedTimestamp())
|
| 116 |
<td>
|
121 |
<td>
|
| 117 |
<button class="btn btn-primary verify-order-item"
|
122 |
<button class="btn btn-primary verify-order-item"
|
| 118 |
data-poitemid="$request.getId()" type="button"
|
123 |
data-poitemid="$request.getId()" type="button"
|
| 119 |
style="width: 100%; border-radius: 0px;">Mark Verify</button>
|
124 |
style="width: 100%; border-radius: 0px;">Mark Verify</button>
|
| 120 |
</td> #else
|
125 |
</td> #else
|