SmartDukaan – /

Rev 28400 –

tejbeer — Thu, 13 May 2021 20:45:17 +0530

tejbeer – 2 file(s) modified

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

Rev 28399 –

tejbeer — Thu, 13 May 2021 20:39:43 +0530

tejbeer – 1 file(s) modified

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

Rev 28398 –

tejbeer — Thu, 13 May 2021 20:38:07 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java

Rev 28397 –

tejbeer — Thu, 13 May 2021 20:33:42 +0530

tejbeer – 2 file(s) modified

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

Rev 28396 –

tejbeer — Thu, 13 May 2021 20:23:10 +0530

tejbeer – 1 file(s) modified

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

Rev 28395 – Added changes for activation schemes

amit.gupta — Thu, 13 May 2021 20:10:35 +0530

amit.gupta – 6 file(s) modified
Added changes for activation schemes

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /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 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 28390 –

amit.gupta — Thu, 13 May 2021 17:19:32 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 28389 –

amit.gupta — Thu, 13 May 2021 12:14:45 +0530

amit.gupta – 2 file(s) modified

~ /trunk/profitmandi-cron/build.gradle
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java

Rev 28388 – Fixed scheduled tasks

amit.gupta — Thu, 13 May 2021 12:12:47 +0530

amit.gupta – 1 file(s) modified
Fixed scheduled tasks

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 28387 –

tejbeer — Wed, 12 May 2021 20:25:33 +0530

tejbeer – 1 file(s) modified

+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-pincode-partner.vm

Rev 28386 –

tejbeer — Wed, 12 May 2021 20:22:35 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-all-order-item.vm

Rev 28385 –

tejbeer — Wed, 12 May 2021 19:59:04 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 28384 –

tejbeer — Wed, 12 May 2021 19:54:53 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js

Rev 28383 –

tejbeer — Wed, 12 May 2021 19:52:23 +0530

tejbeer – 2 file(s) modified

~ /trunk/profitmandi-cron/build.gradle
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js

Rev 28382 –

tejbeer — Wed, 12 May 2021 19:48:08 +0530

tejbeer – 3 file(s) modified

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js

Rev 28381 – create Pincod Partner

tejbeer — Wed, 12 May 2021 19:21:57 +0530

tejbeer – 9 file(s) modified
create Pincod Partner

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PincodePartner.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PincodePartnerRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PincodePartnerRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer-block-brands.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-partner-pincode.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pincode-partner-index.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pincode-partner-row-index.vm

Rev 28380 –

tejbeer — Wed, 12 May 2021 19:00:56 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-cron/build.gradle

Rev 28379 –

tejbeer — Wed, 12 May 2021 18:54:39 +0530

tejbeer – 1 file(s) modified

x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/services/EmailService.java

Rev 28378 –

tejbeer — Wed, 12 May 2021 18:52:56 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-dao/build.gradle

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 28375 –

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

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/OtpProcessor.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 28373 –

amit.gupta — Tue, 11 May 2021 19:59:35 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/WebOfferProductRepositoryImpl.java

Rev 28372 –

amit.gupta — Tue, 11 May 2021 19:42:33 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 28371 – Added web offers

amit.gupta — Tue, 11 May 2021 19:29:00 +0530

amit.gupta – 13 file(s) modified
Added web offers

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/WebOffer.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/WebOfferProduct.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/WebOfferProductRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/WebOfferProductRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/WebOfferRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/WebOfferRepositoryImpl.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/service/inventory/FofoCatalogResponse.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebOffersController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/web-offers.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-offer-product.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-offer.vm

Rev 28370 –

tejbeer — Tue, 11 May 2021 13:59:34 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 28369 –

tejbeer — Tue, 11 May 2021 13:52:46 +0530

tejbeer – 2 file(s) modified

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/RazorpayPaymentService.java

Rev 28368 – chnage

tejbeer — Tue, 11 May 2021 12:08:21 +0530

tejbeer – 4 file(s) modified
chnage

~ /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/RazorPayRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RazorPayRepositoryImpl.java

Rev 28367 – change

tejbeer — Mon, 10 May 2021 19:03:25 +0530

tejbeer – 2 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RazorPay.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java

Rev 28366 –

tejbeer — Sat, 08 May 2021 18:12:46 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm

Rev 28365 –

tejbeer — Sat, 08 May 2021 18:10:01 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm

Rev 28364 –

tejbeer — Sat, 08 May 2021 18:06:33 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm

Rev 28363 –

tejbeer — Sat, 08 May 2021 17:49:08 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm

Rev 28362 – change

tejbeer — Sat, 08 May 2021 13:25:26 +0530

tejbeer – 4 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /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

Rev 28361 – chnage

tejbeer — Sat, 08 May 2021 13:08:05 +0530

tejbeer – 3 file(s) modified
chnage

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order.vm