Subversion Repositories SmartDukaan

Rev

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

Rev 3578 Rev 3711
Line 204... Line 204...
204 
                <th>Product</th>
 204 
                <th>Product</th>
205 
                <th>Created</th>
 205 
                <th>Created</th>
206 
                <th>Amount</th>
 206 
                <th>Amount</th>
207 
                <th>Shipping Address</th>
 207 
                <th>Shipping Address</th>
208 
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
 208 
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
- 
 
 209 
                <th>Expected delivery</th>
209 
                <th></th>
 210 
                <th></th>
210 
                <th></th>
 211 
                <th></th>
211 
                #end
 212 
                #end
212 
            </tr>
 213 
            </tr>
213 
        </thead>
 214 
        </thead>
Line 227... Line 228...
227 
                <td class="truncated-text-for-order-table">$action.getProductName($order.getLineitems().get(0))</td>
 228 
                <td class="truncated-text-for-order-table">$action.getProductName($order.getLineitems().get(0))</td>
228 
                <td class="truncated-text-for-order-table">$action.convertDate($order.getCreated_timestamp())</td>
 229 
                <td class="truncated-text-for-order-table">$action.convertDate($order.getCreated_timestamp())</td>
229 
                <td>$order.getTotal_amount()</td>
 230 
                <td>$order.getTotal_amount()</td>
230 
                <td class="truncated-text-for-order-table" title="$action.getAddress($order)">$order.getCustomer_city()</td>
 231 
                <td class="truncated-text-for-order-table" title="$action.getAddress($order)">$order.getCustomer_city()</td>
231 
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
 232 
                #if($ticket.getCategory().name().equals("COD_VERIFICATION"))
- 
 
 233 
                <td class="truncated-text-for-order-table">$action.convertDate($order.getExpected_delivery_time())</td>
232 
                <td ><input type="button" value="COD verified" ticketId="$ticketId" orderId="$orderId" orderStatus="SUBMITTED_FOR_PROCESSING" class="update-order-status"/> </td>
 234 
                <td ><input type="button" value="COD verified" ticketId="$ticketId" orderId="$orderId" orderStatus="SUBMITTED_FOR_PROCESSING" class="update-order-status"/> </td>
233 
                <td ><input type="button" value="Cancel order" ticketId="$ticketId" orderId="$orderId" orderStatus="CANCELED" class="update-order-status"/> </td>
 235 
                <td ><input type="button" value="Cancel order" ticketId="$ticketId" orderId="$orderId" orderStatus="CANCELED" class="update-order-status"/> </td>
234 
                #end
 236 
                #end
235 
            </tr>
 237 
            </tr>
236 
            #end
 238 
            #end
Line 317... Line 319...
317 
            width : 65,
 319 
            width : 65,
318 
            addtitle : true
 320 
            addtitle : true
319 
        });
 321 
        });
320 
 
 322 
 
321 
        $(".truncated-text-for-order-table").truncate({
 323 
        $(".truncated-text-for-order-table").truncate({
322 
            width : 100,
 324 
            width : 85,
323 
            addtitle : true
 325 
            addtitle : true
324 
        });
 326 
        });
325 
    }
 327 
    }
326 
);
 328 
);
327 
</script>
 329 
</script>