SmartDukaan – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 27057 – change

tejbeer — Fri, 18 Sep 2020 13:17:55 +0530

tejbeer – 2 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

Rev 27046 – change

tejbeer — Tue, 15 Sep 2020 10:48:07 +0530

tejbeer – 11 file(s) modified
change

x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomerOrderDetail.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/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/model/CustomerOrderDetail.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/PendingOrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java

Rev 26817 – Added Online sale

amit.gupta — Thu, 16 Jul 2020 11:46:15 +0530

amit.gupta – 30 file(s) modified
Added Online sale

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/StateGstRate.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TaxRate.java@26812)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TaxRate.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CustomerAddress.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.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/entity/fofo/PendingOrderItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/StateGstRateRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/StateGstRateRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerRepositoryImpl.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/CustomerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/CustomerServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CustomerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/activated-imeis.js
~ /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/inventory.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.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-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

Rev 26721 – change

tejbeer — Fri, 05 Jun 2020 13:01:10 +0530

tejbeer – 14 file(s) modified
change

~ /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/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/PendingOrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partners_allocation.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

Rev 26663 – change

tejbeer — Mon, 18 May 2020 14:40:10 +0530

tejbeer – 4 file(s) modified
change

~ /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-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm

Rev 26647 – change

tejbeer — Thu, 14 May 2020 15:47:54 +0530

tejbeer – 7 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.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

Rev 26531 –

amit.gupta — Fri, 17 Apr 2020 17:04:26 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 26514 –

amit.gupta — Fri, 03 Apr 2020 17:01:14 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 25726 – Fixed changes for toffee

amit.gupta — Wed, 30 Oct 2019 12:20:41 +0530

amit.gupta – 29 file(s) modified
Fixed changes for toffee

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/InsuranceModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/AuthLink.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TaxRate.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/InsurancePolicy.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/InventoryWarehouse.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/inventory/InventoryWarehouseRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/InventoryWarehouseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/toffee/model/InsuranceRequestModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/toffee/model/Premium.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/toffee/model/PremiumCalculationRequestModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/toffee/model/Product.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/toffee/model/ProductDetails.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/toffee/ToffeeService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceService.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/ZestService.java@25717)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceServiceImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/ZestServiceImpl.java@25717)
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/MobileInsurancePlan.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/WiseappInsuranceServiceImpl.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/ZestService.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/ZestServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/provider/OxigenRechargeProviderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerTargetController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/provider-logos/bharti.jpg

Rev 25608 – change

tejbeer — Fri, 20 Sep 2019 15:04:29 +0530

tejbeer – 3 file(s) modified
change

Rev 25607 – chnage

tejbeer — Fri, 20 Sep 2019 13:33:20 +0530

tejbeer – 1 file(s) modified
chnage

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 25606 – change

tejbeer — Fri, 20 Sep 2019 13:09:29 +0530

tejbeer – 1 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 25562 –

amit.gupta — Fri, 13 Sep 2019 09:27:33 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 25093 – Fixed invoice generation

amit.gupta — Wed, 19 Jun 2019 14:54:08 +0530

amit.gupta – 5 file(s) modified
Fixed invoice generation

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history.vm

Rev 25092 –

amit.gupta — Wed, 19 Jun 2019 14:40:31 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 24880 – DashBoard Front page

govind — Thu, 25 Apr 2019 11:43:30 +0530

govind – 18 file(s) modified
DashBoard Front page

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/InsurancePolicy.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsurancePolicyRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsurancePolicyRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsuranceProviderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsuranceProviderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeTransactionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeTransactionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/insurance-details-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/insurance-details.vm
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/my-ticket.vm

Rev 24844 –

amit.gupta — Wed, 10 Apr 2019 17:53:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 24440 – Improved order creation and added Zest integration

amit.gupta — Sat, 26 Jan 2019 00:47:42 +0530

amit.gupta – 30 file(s) modified
Improved order creation and added Zest integration

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/DateTimePattern.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreateOrderRequest.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomCustomer.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/InsuranceModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SerialNumberDetail.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/WiseAppInsuaranceModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/InsurancePolicy.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/MobileInsurancePlan.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/WiseappInsuranceServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/WiseappWebService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/ZestResponseModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/ZestService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/ZestServiceImpl.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/WebConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/provider-logos
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/provider-logos/icici.jpg
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/provider-logos/iffco.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/provider-logos/tataaig.png
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
~ /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/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 24341 –

amit.gupta — Tue, 18 Dec 2018 15:35:53 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 24282 – Fixed Fofo Update

amit.gupta — Tue, 11 Dec 2018 17:24:17 +0530

amit.gupta – 1 file(s) modified
Fixed Fofo Update

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 24281 – Added more options

amit.gupta — Tue, 11 Dec 2018 17:11:31 +0530

amit.gupta – 1 file(s) modified
Added more options

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 24276 – Fixed partner mark

amit.gupta — Tue, 11 Dec 2018 16:30:22 +0530

amit.gupta – 12 file(s) modified
Fixed partner mark

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDailyInvestment.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerDailyInvestmentRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerDailyRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TargetSlabRepository.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupportController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/dashboard.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java

Rev 24271 – Added Neeraj

amit.gupta — Tue, 11 Dec 2018 11:24:26 +0530

amit.gupta – 17 file(s) modified
Added Neeraj

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ScanRecordRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/customer-return.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/dashboard.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 24167 –

amit.gupta — Tue, 30 Oct 2018 13:02:33 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 24152 – Payment Option Editing

govind — Fri, 12 Oct 2018 17:18:33 +0530

govind – 4 file(s) modified
Payment Option Editing

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PaymentOptionTransactionModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm

Rev 24105 – change in Payment details in search Order

govind — Fri, 21 Sep 2018 15:52:18 +0530

govind – 8 file(s) modified
change in Payment details in search Order

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PaymentOptionTransactionModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PaymentOptionTransactionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PaymentOptionTransactionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm

Rev 24094 – Fixed doa logic. Added DOA logic extended in case of ...

amit.gupta — Fri, 14 Sep 2018 13:11:11 +0530

amit.gupta – 4 file(s) modified
Fixed doa logic. Added DOA logic extended in case of featured phones.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrderItem.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm

Rev 24087 – Fixed issues related to prebooking. Added price drop logic

amit.gupta — Fri, 07 Sep 2018 15:52:48 +0530

amit.gupta – 36 file(s) modified
Fixed issues related to prebooking.
Added price drop logic

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePrebookingListingRequest.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePrebookingOrderRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingOrder.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingOrderItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepositoryImpl.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderItemRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PrebookingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CustomerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PrebookingController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-prebooking-listing.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-prebooking-order.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-description.vm (copied from /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items-description.vm@24085)
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items-description.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-order-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-orders-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-orders.vm

Rev 23973 – search sale History by different parameter

govind — Fri, 03 Aug 2018 12:07:31 +0530

govind – 6 file(s) modified
search sale History by different parameter

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/SearchType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history.vm

Rev 23952 – Fixed the issue related to primary key with PaymentOptionTransaction

amit.gupta — Thu, 26 Jul 2018 19:21:55 +0530

amit.gupta – 1 file(s) modified
Fixed the issue related to primary key with PaymentOptionTransaction

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 23939 – OK

amit.gupta — Fri, 20 Jul 2018 06:42:48 +0530

amit.gupta – 1 file(s) modified
OK

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 23897 –

amit.gupta — Mon, 16 Jul 2018 16:07:23 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 23895 –

amit.gupta — Mon, 16 Jul 2018 15:23:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 23891 – Fixed issue related to js

amit.gupta — Mon, 16 Jul 2018 14:53:34 +0530

amit.gupta – 3 file(s) modified
Fixed issue related to js

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 23823 – Fixed reports.

amit.gupta — Fri, 29 Jun 2018 17:16:33 +0530

amit.gupta – 6 file(s) modified
Fixed reports.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ScanRecord.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java

Rev 23821 – Fixed Hot Deals

amit.gupta — Fri, 29 Jun 2018 08:16:17 +0530

amit.gupta – 5 file(s) modified
Fixed Hot Deals

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PriceModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 23798 – Fixed role related changes.

amit.gupta — Mon, 25 Jun 2018 10:17:18 +0530

amit.gupta – 13 file(s) modified
Fixed role related changes.

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication/RoleManager.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/RoleManager.java@23797)
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/RoleInterceptor.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/RoleManager.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java

Rev 23786 – Major commit. 1. Fixed profitmandi-web refactored as per new role ...

amit.gupta — Thu, 14 Jun 2018 15:38:04 +0530

amit.gupta – 45 file(s) modified
Major commit.
1. Fixed profitmandi-web refactored as per new role management logic.
2. Added Allocation Mechanism
3. Minor bug fixes.

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/CounterSize.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BrandPerformance.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemIdAvailability.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/StockAllocationModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStoreSequenceGeneration.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/StockAllocation.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StockAllocationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StockAllocationRepositoryImp.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/StockAllocationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/StockAllocationServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/RoleManager.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/bootstrap3-typeahead.min.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/RoleManagerService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/UserAddRoleRequest.java

Rev 23784 – Role mgmt and non billable items to be scan

ashik.ali — Fri, 08 Jun 2018 20:38:47 +0530

ashik.ali – 21 file(s) modified
Role mgmt and non billable items to be scan

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PrebookingController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WarehouseController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/RoleInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/model/LoginDetails.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/RoleManager.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/Utils.java

Rev 23657 –

amit.gupta — Mon, 21 May 2018 12:40:23 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java