Subversion Repositories SmartDukaan

Rev

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

Rev 33402 Rev 33437
Line 54... Line 54...
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>Original Order Id</th>
59 
                    <th>Partner</th>
 60 
                    <th>Partner</th>
60 
                    <th>Pay Method</th>
 61 
                    <th>Pay Method</th>
61 
                    <th>Pay Mode</th>
 62 
                    <th>Pay Mode</th>
62 
                    <th>Order Item Id</th>
 63 
                    <th>Order Item Id</th>
63 
                    <th>Item Id</th>
 64 
                    <th>Item Id</th>
Line 69... Line 70...
69 
                    <th>Billed On</th>
 70 
                    <th>Billed On</th>
70 
                    <th>Delivered On</th>
 71 
                    <th>Delivered On</th>
71 
                    <th>Cancelled On</th>
 72 
                    <th>Cancelled On</th>
72 
                    <th>Remarks</th>
 73 
                    <th>Remarks</th>
73 
                    <th>Availability</th>
 74 
                    <th>Availability</th>
74 
                    <th>Verify</th>
 75 
                    <th>Action</th>
75 
                    <th>Cancel</th>
 76 
                </tr>
76 
                    <th>Change Partner</th>
 - 
 
77 
                    <th>Claimed Payment</th>
 - 
 
78 
 
 - 
 
79 
					</tr>
 - 
 
80 
				</thead>
 77 
				</thead>
81 
				<tbody>
 78 
				<tbody>
82 
                    $pendingOrderItems.size()
 79 
                    $pendingOrderItems.size()
83 
                    #if($pendingOrderItems)
 80 
                    #if($pendingOrderItems)
84 
                        #foreach( $pendingOrderItem in $pendingOrderItems)
 81 
                        #foreach( $pendingOrderItem in $pendingOrderItems)
Line 92... Line 89...
92 
                            <td>$pendingOrderItem.getPendingOrder().getCustomerAddress().getPhoneNumber()</td>
 89 
                            <td>$pendingOrderItem.getPendingOrder().getCustomerAddress().getPhoneNumber()</td>
93 
                            #if($pendingOrderItem.getPendingOrder().getCustomerAddress().getPinCode())
 90 
                            #if($pendingOrderItem.getPendingOrder().getCustomerAddress().getPinCode())
94 
                                <td>$pendingOrderItem.getPendingOrder().getCustomerAddress().getPinCode()</td>
 91 
                                <td>$pendingOrderItem.getPendingOrder().getCustomerAddress().getPinCode()</td>
95 
                            #else
 92 
                            #else
96 
                                <td></td> #end
 93 
                                <td></td> #end
97 
                            ##                            <td>$pendingOrderItem.getPendingOrder().getStatus()</td>
 94 
                            ## <td>$pendingOrderItem.getPendingOrder().getStatus()</td>
- 
 
 95 
                            <td>$pendingOrderItem.getOriginalOrderId()</td>
98 
                            #if($customRetailersMap.get($pendingOrderItem.getPendingOrder().getFofoId()))
 96 
                            #if($customRetailersMap.get($pendingOrderItem.getPendingOrder().getFofoId()))
99 
                                <td>$customRetailersMap.get($pendingOrderItem.getPendingOrder().getFofoId()).getBusinessName()</td>
 97 
                                <td>$customRetailersMap.get($pendingOrderItem.getPendingOrder().getFofoId()).getBusinessName()</td>
100 
						#else
 98 
						#else
101 
                            <td></td> #end
 99 
                            <td></td> #end
102 
                            <td>$pendingOrderItem.getPendingOrder().getPayMethodDescription()</td>
 100 
                            <td>$pendingOrderItem.getPendingOrder().getPayMethodDescription()</td>
Line 134... Line 132...
134 
                        #elseif($pendingOrderItem.getStatus() == "CLAIMED")
 132 
                        #elseif($pendingOrderItem.getStatus() == "CLAIMED")
135 
                            <td></td>
 133 
                            <td></td>
136 
                        #else
 134 
                        #else
137 
                            <td>out of stock</td>
 135 
                            <td>out of stock</td>
138 
                        #end
 136 
                        #end
- 
 
 137 
                            <td style="display: flex;">
139 
                            #if($pendingOrderItem.getStatus() ==
 138 
                            #if($pendingOrderItem.getStatus() ==
140 
                                "PROCESSING" && !$pendingOrderItem.getVerifiedTimestamp())
 139 
                                "PROCESSING" && !$pendingOrderItem.getVerifiedTimestamp())
141 
                                <td>
 - 
 
142 
                                    <button class="btn btn-primary verify-order-item"
 140 
                                <button class="btn btn-primary verify-order-item"
143 
                                            data-poitemid="$pendingOrderItem.getId()" type="button"
 141 
                                        data-poitemid="$pendingOrderItem.getId()" type="button"
144 
                                            style="width: 100%; border-radius: 0px;">Mark Verify
 142 
                                        style="width: 100%; border-radius: 0px;margin-right: 5px;">Mark Verify
145 
                                    </button>
 143 
                                </button>
146 
                                </td>
 - 
 
147 
                            #else
 - 
 
148 
                                <td></td>
 - 
 
149 
                            #end
 144 
                            #end
150 
                            #if($pendingOrderItem.getStatus() == "PROCESSING")
 145 
                            #if($pendingOrderItem.getStatus() == "PROCESSING")
151 
                        <td>
 - 
 
152 
                            <button class="btn btn-primary cancel-order-item"
 146 
                                <button class="btn btn-primary cancel-order-item"
153 
                                    data-poitemid="$pendingOrderItem.getId()" type="button"
 147 
                                        data-poitemid="$pendingOrderItem.getId()" type="button"
154 
                                    data-toggle="modal" data-target="#cancelOnlineOrder"
 148 
                                        data-toggle="modal" data-target="#cancelOnlineOrder"
155 
                                    style="width: 100%; border-radius: 0px;">Cancel
 149 
                                        style="width: 100%; border-radius: 0px;margin-right: 5px;">Cancel
156 
                            </button>
 150 
                                </button>
157 
                        </td> #else
 151 
                            #end
158 
                        <td></td> #end #if($pendingOrderItem.getStatus() == "PROCESSING")
 152 
                                #if($pendingOrderItem.getStatus().name().equals(
- 
 
 153 
                                    "PROCESSING") && !($pendingOrderItem.getPendingOrder().getStatus().name().equals(
159 
                        <td>
 154 
                                    "BILLED")))
160 
                            <button class="btn btn-primary change-partner"
 155 
                                    <button class="btn btn-primary change-partner"
161 
                                    data-poid="$pendingOrderItem.getPendingOrder().getId()"
 156 
                                            data-poid="$pendingOrderItem.getPendingOrder().getId()"
162 
                                    data-pincode="$pendingOrderItem.getPendingOrder().getCustomerAddress().getPinCode()"
 157 
                                            data-pincode="$pendingOrderItem.getPendingOrder().getCustomerAddress().getPinCode()"
163 
                                    type="button"
 158 
                                            type="button"
164 
                                    data-toggle="modal"
 159 
                                            data-toggle="modal"
165 
                                    data-target="#changePartnerOnlineOrder"
 160 
                                            data-target="#changePartnerOnlineOrder"
166 
                                    style="width: 100%; border-radius: 0px;">Change
 161 
                                            style="width: 100%; border-radius: 0px;margin-right: 5px;">Change
167 
                            </button>
 162 
                                    </button>
168 
                        </td> #else
 - 
 
169 
                        <td></td> #end
 163 
                                #end
170 
                            #if($pendingOrderItem.getStatus() == "CLAIMED")
 164 
                            #if($pendingOrderItem.getStatus() == "CLAIMED")
171 
                                #if($isAccountsL2)
 165 
                                #if($isAccountsL2AndL3)
172 
                                    <td>
 - 
 
173 
                                        <button class="btn btn-primary claimed-payment"
 166 
                                    <button class="btn btn-primary claimed-payment"
174 
                                                data-poitemid="$pendingOrderItem.getId()" type="button"
 167 
                                            data-poitemid="$pendingOrderItem.getId()" type="button"
175 
                                                style="width: 100%; border-radius: 0px;">Release Payment
 168 
                                            style="width: 100%; border-radius: 0px;">Release Payment
176 
                                        </button>
 169 
                                    </button>
177 
                                    </td>
 - 
 
178 
                                #else
 - 
 
179 
                                    <td></td>
 - 
 
180 
                                #end
 170 
                                #end
181 
                            #else
 - 
 
182 
                                <td></td>
 - 
 
183 
                            #end
 171 
                            #end
184 
 
 - 
 
- 
 
 172 
                            </td>
185 
                    </tr>
 173 
                    </tr>
186 
                    #end
 174 
                    #end
187 
                    <script type="text/javascript">
 175 
                    <script type="text/javascript">
188 
                        $(document).ready(function () {
 176 
                        $(document).ready(function () {
189 
                            $('#pending-order-item').dataTable({
 177 
                            $('#pending-order-item').dataTable({