Subversion Repositories SmartDukaan

Rev

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

Rev 33400 Rev 33402
Line 53... Line 53...
53 
                    <th>OrderId</th>
 53 
                    <th>OrderId</th>
54 
                    <th>First Name</th>
 54 
                    <th>First Name</th>
55 
                    <th>Last Name</th>
 55 
                    <th>Last Name</th>
56 
                    <th>Mobile</th>
 56 
                    <th>Mobile</th>
57 
                    <th>Pincode</th>
 57 
                    <th>Pincode</th>
58 
                    <th>Order Status</th>
 58 
                    ##                    <th>Order Status</th>
59 
                    <th>Partner</th>
 59 
                    <th>Partner</th>
60 
                    <th>Pay Method</th>
 60 
                    <th>Pay Method</th>
61 
                    <th>Pay Mode</th>
 61 
                    <th>Pay Mode</th>
62 
                    <th>Order Item Id</th>
 62 
                    <th>Order Item Id</th>
63 
                    <th>Item Id</th>
 63 
                    <th>Item Id</th>
Line 92... Line 92...
92 
                            <td>$pendingOrderItem.getPendingOrder().getCustomerAddress().getPhoneNumber()</td>
 92 
                            <td>$pendingOrderItem.getPendingOrder().getCustomerAddress().getPhoneNumber()</td>
93 
                            #if($pendingOrderItem.getPendingOrder().getCustomerAddress().getPinCode())
 93 
                            #if($pendingOrderItem.getPendingOrder().getCustomerAddress().getPinCode())
94 
                                <td>$pendingOrderItem.getPendingOrder().getCustomerAddress().getPinCode()</td>
 94 
                                <td>$pendingOrderItem.getPendingOrder().getCustomerAddress().getPinCode()</td>
95 
                            #else
 95 
                            #else
96 
                                <td></td> #end
 96 
                                <td></td> #end
97 
                            <td>$pendingOrderItem.getPendingOrder().getStatus()</td>
 97 
                            ##                            <td>$pendingOrderItem.getPendingOrder().getStatus()</td>
98 
                            #if($customRetailersMap.get($pendingOrderItem.getPendingOrder().getFofoId()))
 98 
                            #if($customRetailersMap.get($pendingOrderItem.getPendingOrder().getFofoId()))
99 
                                <td>$customRetailersMap.get($pendingOrderItem.getPendingOrder().getFofoId()).getBusinessName()</td>
 99 
                                <td>$customRetailersMap.get($pendingOrderItem.getPendingOrder().getFofoId()).getBusinessName()</td>
100 
						#else
 100 
						#else
101 
                            <td></td> #end
 101 
                            <td></td> #end
102 
                            <td>$pendingOrderItem.getPendingOrder().getPayMethodDescription()</td>
 102 
                            <td>$pendingOrderItem.getPendingOrder().getPayMethodDescription()</td>
Line 170... Line 170...
170 
                            #if($pendingOrderItem.getStatus() == "CLAIMED")
 170 
                            #if($pendingOrderItem.getStatus() == "CLAIMED")
171 
                                #if($isAccountsL2)
 171 
                                #if($isAccountsL2)
172 
                                    <td>
 172 
                                    <td>
173 
                                        <button class="btn btn-primary claimed-payment"
 173 
                                        <button class="btn btn-primary claimed-payment"
174 
                                                data-poitemid="$pendingOrderItem.getId()" type="button"
 174 
                                                data-poitemid="$pendingOrderItem.getId()" type="button"
175 
                                                style="width: 100%; border-radius: 0px;">Payment Claimed
 175 
                                                style="width: 100%; border-radius: 0px;">Release Payment
176 
                                        </button>
 176 
                                        </button>
177 
                                    </td>
 177 
                                    </td>
178 
                                #else
 178 
                                #else
179 
                                    <td></td>
 179 
                                    <td></td>
180 
                                #end
 180 
                                #end