Subversion Repositories SmartDukaan

Rev

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

Rev 33642 Rev 33741
Line 129... Line 129...
129 
        </tbody>
 129 
        </tbody>
130 
    </table>
 130 
    </table>
131 
    #if(!$inStockOrdersSerialized.isEmpty() || !$inStockOrdersNonSerialized.isEmpty())
 131 
    #if(!$inStockOrdersSerialized.isEmpty() || !$inStockOrdersNonSerialized.isEmpty())
132 
        <div class="row">
 132 
        <div class="row">
133 
            <div class="col-md-12">
 133 
            <div class="col-md-12">
- 
 
 134 
                <div class="form-group row">
- 
 
 135 
                    <label for="inputEmail3" class="col-sm-2 col-form-label">$oneOrder.getRetailerCity()
- 
 
 136 
                        , $oneOrder.getRetailerState() - $oneOrder.getRetailerPinCode()</label>
- 
 
 137 
                    <div class="col-sm-3">
- 
 
 138 
                        <select class="form-control mk_provider">
- 
 
 139 
                            <option selected>Choose Provider</option>
- 
 
 140 
                            #foreach($warehouseProvider in $warehouseProviders)
- 
 
 141 
                                <option value="$warehouseProvider.getGstin()" data-providerid="$warehouseProvider.getProviderId()">
- 
 
 142 
                                    $warehouseProvider.getProviderName()
- 
 
 143 
                                </option>
- 
 
 144 
                            #end
- 
 
 145 
                        </select>
- 
 
 146 
                    </div>
- 
 
 147 
                    <div class="col-sm-3 mk_self" style="display: none">
- 
 
 148 
                        <input class="form-control mk_vehicleNumber" type="text" placeholder="Vehicle No. UP16XX"
- 
 
 149 
                               />
- 
 
 150 
                    </div>
- 
 
 151 
                    <div class="col-sm-3 mk_rider" style="display: none">
- 
 
 152 
                        <select class="form-control">
- 
 
 153 
                            <option selected>Choose Rider</option>
- 
 
 154 
                            #foreach($rider in $riders)
- 
 
 155 
                                <option value="$rider.getVehicleNumber()">
- 
 
 156 
                                    $rider.getRiderName() - $rider.getVehicleNumber()
- 
 
 157 
                                </option>
- 
 
 158 
                            #end
- 
 
 159 
                        </select>
- 
 
 160 
                    </div>
- 
 
 161 
                    <div class="col-sm-4 pull-right">
134 
                <button type="button" class="btn btn-info pull-right order_accepted">Generate Bill</button>
 162 
                        <button type="button" class="btn btn-info pull-right order_accepted">Generate Bill</button>
- 
 
 163 
                    </div>
- 
 
 164 
                </div>
- 
 
 165 
 
135 
            </div>
 166 
            </div>
136 
        </div>
 167 
        </div>
137 
    #end
 168 
    #end
138 
 
 169 
 
139 
</div>
 170 
</div>
Line 168... Line 199...
168 
                                data-itemId="$order.getLineItem().getItemId()"
 199 
                                data-itemId="$order.getLineItem().getItemId()"
169 
                                data-warehouseId="$order.getWarehouseId()">
 200 
                                data-warehouseId="$order.getWarehouseId()">
170 
                            Change Billing Warehouse
 201 
                            Change Billing Warehouse
171 
                        </button>
 202 
                        </button>
172 
                        <br/>
 203 
                        <br/>
173 
                        <button type="button" class="btn btn-primary btn-sm mk_moveToBill" data-orderid="$order.getId()" data-warehouseid="$order.getWarehouseId()" data-transactionid="$order.getTransactionId()">Move to Bill</button>
 204 
                        <button type="button" class="btn btn-primary btn-sm mk_moveToBill" data-orderid="$order.getId()"
- 
 
 205 
                                data-warehouseid="$order.getWarehouseId()"
- 
 
 206 
                                data-transactionid="$order.getTransactionId()">Move to Bill
- 
 
 207 
                        </button>
174 
                    </td>
 208 
                    </td>
175 
                </tr>
 209 
                </tr>
176 
                #end
 210 
                #end
177 
            #end
 211 
            #end
178 
            #if(!$outOfStockOrdersNonSerialized.isEmpty())
 212 
            #if(!$outOfStockOrdersNonSerialized.isEmpty())
Line 240... Line 274...
240 
    </div>
 274 
    </div>
241 
</div>
 275 
</div>
242 
 
 276 
 
243 
<script>
 277 
<script>
244 
    $(document).ready(function () {
 278 
    $(document).ready(function () {
- 
 
 279 
        debugger;
245 
        $("#wareHouseTransactionTable > tbody > tr").each(function () {
 280 
        $("#wareHouseTransactionTable > tbody > tr").each(function () {
246 
            var qtyElem = $(this).find(".qty");
 281 
            var qtyElem = $(this).find(".qty");
247 
            var remainQtyElem = $(this).find(".remainQty");
 282 
            var remainQtyElem = $(this).find(".remainQty");
248 
            var qty = parseInt(qtyElem.text()); // Get initial quantity
 283 
            var qty = parseInt(qtyElem.text()); // Get initial quantity
249 
            var imeiInputElem = $(this).find(".imeis-to-grn");
 284 
            var imeiInputElem = $(this).find(".imeis-to-grn");
Line 300... Line 335...
300 
                }
 335 
                }
301 
            });
 336 
            });
302 
 
 337 
 
303 
 
 338 
 
304 
        });
 339 
        });
- 
 
 340 
 
- 
 
 341 
        $("select.mk_provider").change(function () {
- 
 
 342 
            $('div.mk_rider').hide();
- 
 
 343 
            $('div.mk_self').hide();
- 
 
 344 
            let providerId = $(this).val();
- 
 
 345 
            if (providerId == SELF_PICKUP) {
- 
 
 346 
                $('div.mk_rider').hide();
- 
 
 347 
                $('div.mk_self').show();
- 
 
 348 
            } else if (providerId == RUNNER) {
- 
 
 349 
                $('div.mk_self').hide();
- 
 
 350 
                $('div.mk_rider').show();
- 
 
 351 
 
- 
 
 352 
            }
- 
 
 353 
        });
305 
    });
 354 
    });
306 
</script>
 355 
</script>
307 
 
 356