Subversion Repositories SmartDukaan

Rev

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

Rev 37374 Rev 37394
Line 25... Line 25...
25
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
25
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
26
import com.spice.profitmandi.dao.repository.fofo.ActivatedImeiRepository;
26
import com.spice.profitmandi.dao.repository.fofo.ActivatedImeiRepository;
27
import com.spice.profitmandi.dao.repository.inventory.ReporticoCacheTableRepository;
27
import com.spice.profitmandi.dao.repository.inventory.ReporticoCacheTableRepository;
28
import com.spice.profitmandi.dao.repository.inventory.SaholicInventoryCISRepository;
28
import com.spice.profitmandi.dao.repository.inventory.SaholicInventoryCISRepository;
29
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
29
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
-
 
30
import com.spice.profitmandi.service.catalog.BrandsService;
30
import com.spice.profitmandi.service.offers.TodayOfferService;
31
import com.spice.profitmandi.service.offers.TodayOfferService;
31
import com.spice.profitmandi.service.transaction.SDCreditService;
32
import com.spice.profitmandi.service.transaction.SDCreditService;
32
import com.spice.profitmandi.service.user.RetailerService;
33
import com.spice.profitmandi.service.user.RetailerService;
33
import org.apache.logging.log4j.LogManager;
34
import org.apache.logging.log4j.LogManager;
34
import org.apache.logging.log4j.Logger;
35
import org.apache.logging.log4j.Logger;
Line 102... Line 103...
102
    BulletinRepository bulletinRepository;
103
    BulletinRepository bulletinRepository;
103
 
104
 
104
    @Autowired
105
    @Autowired
105
    TodayOfferService todayOfferService;
106
    TodayOfferService todayOfferService;
106
 
107
 
-
 
108
    @Autowired
-
 
109
    BrandsService brandsService;
-
 
110
 
107
    List<String> colorList = Arrays.asList("mediumseagreen", "dodgerblue", "darkblue", "gold", "#eb0029", "coral",
111
    List<String> colorList = Arrays.asList("mediumseagreen", "dodgerblue", "darkblue", "gold", "#eb0029", "coral",
108
            "#63C5DA", "red", "deeppink", "midnightblue", "cornsilk");
112
            "#63C5DA", "red", "deeppink", "midnightblue", "cornsilk");
109
 
113
 
110
    List<String> borderList = Arrays.asList("lawngreen", "lightblue", "#0000cd", "#f7e98e", "#eb0029", "lightcoral",
114
    List<String> borderList = Arrays.asList("lawngreen", "lightblue", "#0000cd", "#f7e98e", "#eb0029", "lightcoral",
111
            "#0000cd", "lightsalmon", "pink", "#0000cd", "cornsilk");
115
            "#0000cd", "lightsalmon", "pink", "#0000cd", "cornsilk");
Line 644... Line 648...
644
        List<Menu> menuList = (menus != null) ? this.prepareMenu(menus) : new ArrayList<>();
648
        List<Menu> menuList = (menus != null) ? this.prepareMenu(menus) : new ArrayList<>();
645
        //LOGGER.info("menu" + menuList);
649
        //LOGGER.info("menu" + menuList);
646
        model.addAttribute("menu", menuList);
650
        model.addAttribute("menu", menuList);
647
        // Feeds the brand-filter dropdown on the "Warehouse Wise Report" widget.
651
        // Feeds the brand-filter dropdown on the "Warehouse Wise Report" widget.
648
        // Filter itself is applied via AJAX to /getWarehouseStockByBrand; loading is unaffected.
652
        // Filter itself is applied via AJAX to /getWarehouseStockByBrand; loading is unaffected.
649
        model.addAttribute("whrBrandList", saholicInventoryCISRepository.selectAllBrand());
653
        model.addAttribute("whrBrandList", brandsService.getBrandsToDisplay(3));
650
        return "admin";
654
        return "admin";
651
    }
655
    }
652
 
656
 
653
 
657
 
654
    /**
658
    /**