Subversion Repositories SmartDukaan

Rev

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

Rev 18348 Rev 18351
Line 238... Line 238...
238 
			<td><a href="#" class="mk_transaction">$mapEntry.key</a></td>
 238 
			<td><a href="#" class="mk_transaction">$mapEntry.key</a></td>
239 
			<td>$action.getTransactionTotal().get($mapEntry.key)</td>
 239 
			<td>$action.getTransactionTotal().get($mapEntry.key)</td>
240 
			<td>$action.getTransactionShipping().get($mapEntry.key)</td>
 240 
			<td>$action.getTransactionShipping().get($mapEntry.key)</td>
241 
			<td>$action.getAddress($mapEntry.value)</td>
 241 
			<td>$action.getAddress($mapEntry.value)</td>
242 
			<td>$mapEntry.value.getCustomer_mobilenumber()</td>
 242 
			<td>$mapEntry.value.getCustomer_mobilenumber()</td>
243 
			<td class="center-aligned">$action.getCustomerTrustLevel($order.getCustomer_id())</td>
 243 
			<td class="center-aligned">$action.getCustomerTrustLevel($mapEntry.value)</td>
244 
		</tr>
 244 
		</tr>
245 
		#end
 245 
		#end
246 
		</tbody>
 246 
		</tbody>
247 
	</table>
 247 
	</table>
248 
</div>
 248 
</div>
Line 257... Line 257...
257 
                <th>Order Id</th>
 257 
                <th>Order Id</th>
258 
                <th>Product</th>
 258 
                <th>Product</th>
259 
                <th>Amount</th>
 259 
                <th>Amount</th>
260 
                <th>Expected delivery</th>
 260 
                <th>Expected delivery</th>
261 
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
 261 
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
262 
                <th>TransactionId</th>
 - 
 
263 
                #else
 262 
                #else
264 
                <th>Created</th>
 263 
                <th>Created</th>
265 
                <th>Mobile No</th>
 264 
                <th>Mobile No</th>
266 
                <th>Shipping Address</th>
 265 
                <th>Shipping Address</th>
267 
                #end
 266 
                #end
Line 270... Line 269...
270 
                <th></th>
 269 
                <th></th>
271 
				#elseif($ticket.getCategory().name().equals("STORE_PICKUP"))
 270 
				#elseif($ticket.getCategory().name().equals("STORE_PICKUP"))
272 
				<th>Pickup Expiry</th>
271 
				<th>Pickup Expiry</th>
273 
                <th></th>
 272 
                <th></th>
274 
                <th></th>
 273 
                <th></th>
- 
 
 274 
                <th>TransactionId</th>
275 
				#elseif($ticket.getCategory().name().equals("ORDER_CANCELLATION") || $ticket.getCategory().name().equals("DOA_RECEIVED") || $ticket.getCategory().name().equals("RETURN_FORM"))
 275 
				#elseif($ticket.getCategory().name().equals("ORDER_CANCELLATION") || $ticket.getCategory().name().equals("DOA_RECEIVED") || $ticket.getCategory().name().equals("RETURN_FORM"))
276 
				<th></th>
 276 
				<th></th>
277 
                <th></th>
 277 
                <th></th>
278 
                #elseif($ticket.getCategory().name().equals("DELAYED_DELIVERY"))
 278 
                #elseif($ticket.getCategory().name().equals("DELAYED_DELIVERY"))
279 
                <th>Promised delivery</th>
 279 
                <th>Promised delivery</th>