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

Rev 28394 –

tejbeer — Thu, 13 May 2021 19:54:46 +0530

tejbeer – 2 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

Rev 28393 –

tejbeer — Thu, 13 May 2021 19:46:52 +0530

tejbeer – 2 file(s) modified

Rev 28392 –

tejbeer — Thu, 13 May 2021 19:35:46 +0530

tejbeer – 2 file(s) modified

Rev 28391 – change

tejbeer — Thu, 13 May 2021 18:52:14 +0530

tejbeer – 2 file(s) modified
change

Rev 28377 – chnages

tejbeer — Wed, 12 May 2021 18:49:37 +0530

tejbeer – 35 file(s) modified
chnages

~ /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/EmailService.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-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/java/com/spice/profitmandi/web/controller/OrderController.java
x /trunk/profitmandi-fofo/src/main/resources/order-delivered.vm
x /trunk/profitmandi-fofo/src/main/resources/order-pending-cancel.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/webapp/resources/js/sale.js
~ /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-all-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-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/EmailService.java
x /trunk/profitmandi-web/src/main/resources/order-cancellation.vm
x /trunk/profitmandi-web/src/main/resources/order-confirm.vm

Rev 28376 –

amit.gupta — Wed, 12 May 2021 10:28:51 +0530

amit.gupta – 1 file(s) modified

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

Rev 28374 –

amit.gupta — Tue, 11 May 2021 20:20:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 28355 – change

tejbeer — Thu, 06 May 2021 20:06:15 +0530

tejbeer – 1 file(s) modified
change

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

Rev 28354 – change

tejbeer — Thu, 06 May 2021 19:26:27 +0530

tejbeer – 1 file(s) modified
change

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

Rev 28348 –

amit.gupta — Wed, 05 May 2021 19:44:44 +0530

amit.gupta – 1 file(s) modified

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

Rev 28347 –

amit.gupta — Wed, 05 May 2021 18:55:07 +0530

amit.gupta – 1 file(s) modified

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

Rev 28345 – change

tejbeer — Wed, 05 May 2021 16:38:29 +0530

tejbeer – 4 file(s) modified
change

~ /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-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

Rev 28339 – online order changes

tejbeer — Tue, 04 May 2021 19:37:29 +0530

tejbeer – 29 file(s) modified
online order changes

~ /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/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/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-fofo/src/main/webapp/WEB-INF/views/ftl/billed_order_item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/cart.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/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/WEB-INF/views/ftl/settled_order_item.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/unsettled_order_item.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

Rev 28338 –

amit.gupta — Mon, 03 May 2021 17:10:28 +0530

amit.gupta – 1 file(s) modified

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

Rev 28337 –

amit.gupta — Mon, 03 May 2021 16:43:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 28336 –

amit.gupta — Mon, 03 May 2021 16:34:10 +0530

amit.gupta – 1 file(s) modified

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

Rev 28335 –

amit.gupta — Mon, 03 May 2021 15:57:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 28334 –

amit.gupta — Mon, 03 May 2021 15:46:13 +0530

amit.gupta – 1 file(s) modified

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

Rev 28333 –

amit.gupta — Mon, 03 May 2021 15:42:24 +0530

amit.gupta – 1 file(s) modified

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

Rev 28332 –

amit.gupta — Mon, 03 May 2021 15:42:13 +0530

amit.gupta – 1 file(s) modified

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

Rev 28331 –

amit.gupta — Mon, 03 May 2021 15:39:36 +0530

amit.gupta – 1 file(s) modified

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

Rev 28328 –

amit.gupta — Mon, 03 May 2021 15:22:16 +0530

amit.gupta – 1 file(s) modified

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

Rev 28327 –

amit.gupta — Mon, 03 May 2021 15:03:12 +0530

amit.gupta – 1 file(s) modified

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

Rev 28326 –

amit.gupta — Mon, 03 May 2021 14:52:12 +0530

amit.gupta – 1 file(s) modified

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

Rev 28325 –

amit.gupta — Mon, 03 May 2021 14:51:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 28324 –

amit.gupta — Mon, 03 May 2021 14:42:27 +0530

amit.gupta – 1 file(s) modified

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

Rev 28322 –

amit.gupta — Mon, 03 May 2021 13:41:49 +0530

amit.gupta – 1 file(s) modified

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

Rev 28321 –

amit.gupta — Fri, 30 Apr 2021 14:09:31 +0530

amit.gupta – 1 file(s) modified

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

Rev 28316 –

amit.gupta — Thu, 29 Apr 2021 12:11:49 +0530

amit.gupta – 1 file(s) modified

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

Rev 28315 –

amit.gupta — Thu, 29 Apr 2021 12:05:56 +0530

amit.gupta – 1 file(s) modified

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

Rev 28314 –

amit.gupta — Wed, 28 Apr 2021 21:44:12 +0530

amit.gupta – 1 file(s) modified

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

Rev 28313 –

amit.gupta — Wed, 28 Apr 2021 19:26:17 +0530

amit.gupta – 1 file(s) modified

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

Rev 28312 –

amit.gupta — Wed, 28 Apr 2021 18:08:26 +0530

amit.gupta – 1 file(s) modified

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

Rev 28309 –

amit.gupta — Wed, 28 Apr 2021 11:50:07 +0530

amit.gupta – 1 file(s) modified

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

Rev 28304 – Fixed StoreController

amit.gupta — Tue, 27 Apr 2021 16:14:01 +0530

amit.gupta – 3 file(s) modified
Fixed StoreController

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java
+ /trunk/profitmandi-web/src/main/resources/order-confirm.vm (copied from /trunk/profitmandi-web/src/main/resources/sms.vm@28262)
x /trunk/profitmandi-web/src/main/resources/sms.vm

Rev 28298 – change

tejbeer — Sat, 24 Apr 2021 16:49:53 +0530

tejbeer – 1 file(s) modified
change

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

Rev 28296 –

tejbeer — Sat, 24 Apr 2021 13:49:13 +0530

tejbeer – 1 file(s) modified

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

Rev 28295 –

tejbeer — Sat, 24 Apr 2021 13:44:55 +0530

tejbeer – 1 file(s) modified

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

Rev 28294 –

tejbeer — Sat, 24 Apr 2021 13:43:57 +0530

tejbeer – 1 file(s) modified

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

Rev 28293 – changes

tejbeer — Sat, 24 Apr 2021 13:34:38 +0530

tejbeer – 1 file(s) modified
changes

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