Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
33400 716 d 18 h ranu /trunk/profitmandi-fofo/src/main/ complete spilit order and payment by l2 of pending order item  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/billed_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/claim_raised_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/settled_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/unsettled_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
32767 868 d 20 h shampa /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ translation  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/settled_order_item.vm
28415 1824 d 14 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ change  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/billed_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/claim_raised_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/settled_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/unsettled_order_item.vm
28377 1827 d 14 h tejbeer /trunk/ chnages  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/EmailService.java
/trunk/profitmandi-dao/src/main/resources/order-cancellation.vm
/trunk/profitmandi-dao/src/main/resources/order-confirm.vm
/trunk/profitmandi-dao/src/main/resources/order-delivered.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-all-order-item.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/images/activation-alert.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/alert-icon.png
/trunk/profitmandi-fofo/src/main/resources/order-delivered.vm
/trunk/profitmandi-fofo/src/main/resources/order-pending-cancel.vm
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/EmailService.java
/trunk/profitmandi-web/src/main/resources/order-cancellation.vm
/trunk/profitmandi-web/src/main/resources/order-confirm.vm
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PendingOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerAddressRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerAddressRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerStatsServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/billed_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/claim_raised_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/settled_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/unsettled_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
28344 1834 d 19 h tejbeer /trunk/ change  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PendingOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PendingOrderItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/billed_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/claim_raised_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/settled_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/unsettled_order_item.vm
28339 1835 d 14 h tejbeer /trunk/ online order changes  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/services
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/services/EmailService.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/billed_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/claim_raised_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/settled_order_item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/unsettled_order_item.vm
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CartFofo.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreateOrderRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PendingOrderItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/OrderStatus.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/cart.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-order-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java