Subversion Repositories SmartDukaan

Rev

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

Rev 32627 Rev 32637
Line 257... Line 257...
257
 
257
 
258
        model.addAttribute("fofoOrder", fofoOrder);
258
        model.addAttribute("fofoOrder", fofoOrder);
259
        model.addAttribute("fofoLineItems", fofoLineItems);
259
        model.addAttribute("fofoLineItems", fofoLineItems);
260
        if (customerAddress != null) {
260
        if (customerAddress != null) {
261
            model.addAttribute("customerBillingAddress", orderService.getBillingAddress(customerAddress));
261
            model.addAttribute("customerBillingAddress", orderService.getBillingAddress(customerAddress));
-
 
262
        } else {
-
 
263
            model.addAttribute("customerBillingAddress", "");
-
 
264
 
262
        }
265
        }
263
        model.addAttribute("customerBillingAddressObj", customerAddress);
266
        model.addAttribute("customerBillingAddressObj", customerAddress);
264
        model.addAttribute("customerDetailsObj", customer);
267
        model.addAttribute("customerDetailsObj", customer);
265
        model.addAttribute("paymentOptionTransactions", paymentOptionTransactions);
268
        model.addAttribute("paymentOptionTransactions", paymentOptionTransactions);
266
        model.addAttribute("paymentOptionIdPaymentOptionMap", paymentOptionIdPaymentOptionMap);
269
        model.addAttribute("paymentOptionIdPaymentOptionMap", paymentOptionIdPaymentOptionMap);
Line 361... Line 364...
361
                StringUtils.toString(foiIdCustomerReturnInventoryItemsMap));
364
                StringUtils.toString(foiIdCustomerReturnInventoryItemsMap));
362
        model.addAttribute("fofoOrderItemIdLineItemMap", fofoOrderItemIdLineItemMap);
365
        model.addAttribute("fofoOrderItemIdLineItemMap", fofoOrderItemIdLineItemMap);
363
 
366
 
364
        model.addAttribute("fofoOrderItems", fofoOrderItems);
367
        model.addAttribute("fofoOrderItems", fofoOrderItems);
365
        model.addAttribute("inventoryItemBilledQtyMap", StringUtils.toString(inventoryItemBilledQtyMap));
368
        model.addAttribute("inventoryItemBilledQtyMap", StringUtils.toString(inventoryItemBilledQtyMap));
-
 
369
        if (customerAddress != null) {
-
 
370
 
366
        model.addAttribute("customerBillingAddress", orderService.getBillingAddress(customerAddress));
371
            model.addAttribute("customerBillingAddress", orderService.getBillingAddress(customerAddress));
-
 
372
        } else {
-
 
373
            model.addAttribute("customerBillingAddress", "");
-
 
374
 
-
 
375
        }
367
        model.addAttribute("customerBillingAddressObj", customerAddress);
376
        model.addAttribute("customerBillingAddressObj", customerAddress);
368
        model.addAttribute("paymentOptionTransactions", paymentOptionTransactions);
377
        model.addAttribute("paymentOptionTransactions", paymentOptionTransactions);
369
        model.addAttribute("paymentOptionIdPaymentOptionMap", paymentOptionIdPaymentOptionMap);
378
        model.addAttribute("paymentOptionIdPaymentOptionMap", paymentOptionIdPaymentOptionMap);
370
        model.addAttribute("insurancePolicies", insurancePolicies);
379
        model.addAttribute("insurancePolicies", insurancePolicies);
371
        model.addAttribute("markDefective", this.markDefective(fofoOrder));
380
        model.addAttribute("markDefective", this.markDefective(fofoOrder));