Subversion Repositories SmartDukaan

Rev

Rev 20156 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 20156 Rev 23778
Line 1... Line 1...
1 
/**
 1 
/**
2 
 *
2 
 *
3 
 */
 3 
 */
4 
package in.shop2020.inventory.controllers;
 4 
package in.shop2020.inventory.controllers;
5 
 
 5 
 
6 
import in.shop2020.purchase.Invoice;
 - 
 
7 
import in.shop2020.purchase.PurchaseService.Client;
 - 
 
8 
import in.shop2020.purchase.Supplier;
 - 
 
9 
import in.shop2020.thrift.clients.PurchaseClient;
 - 
 
10 
 
 - 
 
11 
import java.text.SimpleDateFormat;
 6 
import java.text.SimpleDateFormat;
12 
import java.util.Calendar;
 7 
import java.util.Calendar;
13 
import java.util.Date;
 8 
import java.util.Date;
14 
import java.util.HashMap;
 9 
import java.util.HashMap;
15 
import java.util.List;
 10 
import java.util.List;
Line 17... Line 12...
17 
 
 12 
 
18 
import org.apache.commons.logging.Log;
 13 
import org.apache.commons.logging.Log;
19 
import org.apache.commons.logging.LogFactory;
 14 
import org.apache.commons.logging.LogFactory;
20 
import org.apache.shiro.SecurityUtils;
 15 
import org.apache.shiro.SecurityUtils;
21 
 
 16 
 
- 
 
 17 
import in.shop2020.inventory.utils.Utils;
- 
 
 18 
import in.shop2020.purchase.Invoice;
- 
 
 19 
import in.shop2020.purchase.PurchaseService.Client;
- 
 
 20 
import in.shop2020.purchase.Supplier;
- 
 
 21 
import in.shop2020.thrift.clients.PurchaseClient;
- 
 
 22 
 
22 
/**
 23 
/**
23 
 * @author mandeep
 24 
 * @author mandeep
24 
 *
25 
 *
25 
 */
 26 
 */
26 
public class InvoiceController extends BaseController {
 27 
public class InvoiceController extends BaseController {
Line 46... Line 47...
46 
    @Override
 47 
    @Override
47 
    public String index() {
 48 
    public String index() {
48 
        try {
 49 
        try {
49 
            Client purchaseClient = new PurchaseClient().getClient();
 50 
            Client purchaseClient = new PurchaseClient().getClient();
50 
            invoices = purchaseClient.getInvoices(getYesterday().getTime());
 51 
            invoices = purchaseClient.getInvoices(getYesterday().getTime());
51 
            for (Supplier s : purchaseClient.getSuppliers()) {
 52 
            for (Supplier s : Utils.getSuppliers()) {
52 
                suppliers.put(s.getId(), s);
 53 
                suppliers.put(s.getId(), s);
53 
            }
 54 
            }
54 
        } catch (Exception e) {
 55 
        } catch (Exception e) {
55 
            logger.error("Could not fetch invoices", e);
 56 
            logger.error("Could not fetch invoices", e);
56 
        }
 57 
        }
Line 62... Line 63...
62 
     * @see in.shop2020.inventory.controllers.BaseController#editNew()
 63 
     * @see in.shop2020.inventory.controllers.BaseController#editNew()
63 
     */
 64 
     */
64 
    @Override
 65 
    @Override
65 
    public String editNew() {
 66 
    public String editNew() {
66 
        try {
 67 
        try {
67 
            Client purchaseClient = new PurchaseClient().getClient();
 - 
 
68 
            for (Supplier s : purchaseClient.getSuppliers()) {
 68 
            for (Supplier s : Utils.getSuppliers()) {
69 
                suppliers.put(s.getId(), s);
 69 
                suppliers.put(s.getId(), s);
70 
            }
 70 
            }
71 
        } catch (Exception e) {
 71 
        } catch (Exception e) {
72 
            logger.error("Could not fetch suppliers", e);
 72 
            logger.error("Could not fetch suppliers", e);
73 
        }
 73 
        }