SmartDukaan – /

Rev 22554 – Fixed issue related to Clicks controller

amit.gupta — Sun, 08 Oct 2017 00:57:44 +0530

amit.gupta – 6 file(s) modified
Fixed issue related to Clicks controller

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ClicksController.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/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java

Rev 22553 –

amit.gupta — Sun, 08 Oct 2017 00:34:48 +0530

amit.gupta – 1 file(s) modified

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

Rev 22552 – Added caching to itemavailabilitycache

amit.gupta — Sat, 07 Oct 2017 23:32:55 +0530

amit.gupta – 11 file(s) modified
Added caching to itemavailabilitycache

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.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/inventory
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/ItemAvailabilityCache.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/ItemAvailabilityCacheRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/ItemAvailabilityCacheRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/inventory
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/inventory/InventoryService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/inventory/InventoryServiceImpl.java

Rev 22551 –

ashik.ali — Sat, 07 Oct 2017 17:36:16 +0530

ashik.ali – 15 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FofoController.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/WalletController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/line-icons.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-history-paginated.vm

Rev 22550 –

ashik.ali — Sat, 07 Oct 2017 17:31:33 +0530

ashik.ali – 16 file(s) modified

~ /trunk/profitmandi-dao/pom.xml
~ /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/transaction/UserWallet.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWalletHistory.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/transaction/UserWalletHistoryRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepository.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WalletRepository.java@22182)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WalletRepositoryImpl.java@22182)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WalletRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WalletRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java

Rev 22549 –

ashik.ali — Sat, 07 Oct 2017 17:28:44 +0530

ashik.ali – 1 file(s) modified

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/MopPriceModel.java

Rev 22548 – Fixed isFofo dependency of retailer.

amit.gupta — Sat, 07 Oct 2017 13:28:30 +0530

amit.gupta – 3 file(s) modified
Fixed isFofo dependency of retailer.

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagController.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRoleRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRoleRepositoryImpl.java

Rev 22547 – Added payu

amit.gupta — Sat, 07 Oct 2017 13:27:51 +0530

amit.gupta – 1 file(s) modified
Added payu

~ /trunk/profitmandi-admin/src/main/resources/META-INF/staging.properties

Rev 22546 –

amit.gupta — Sat, 07 Oct 2017 10:39:02 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

Rev 22545 –

amit.gupta — Sat, 07 Oct 2017 10:16:21 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

Rev 22544 –

amit.gupta — Sat, 07 Oct 2017 10:02:30 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

Rev 22543 –

amit.gupta — Sat, 07 Oct 2017 09:51:33 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

Rev 22542 –

amit.gupta — Sat, 07 Oct 2017 09:30:32 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

Rev 22541 –

amit.gupta — Sat, 07 Oct 2017 08:59:50 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

Rev 22540 –

ashik.ali — Thu, 05 Oct 2017 11:37:43 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/build.gradle

Rev 22539 –

ashik.ali — Wed, 04 Oct 2017 20:03:25 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/build.gradle

Rev 22538 –

ashik.ali — Wed, 04 Oct 2017 19:33:29 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/build.gradle

Rev 22537 –

ashik.ali — Wed, 04 Oct 2017 19:33:10 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/build.gradle

Rev 22536 –

ashik.ali — Wed, 04 Oct 2017 19:27:38 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/build.gradle

Rev 22535 –

ashik.ali — Wed, 04 Oct 2017 19:11:39 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/build.gradle

Rev 22534 –

ashik.ali — Wed, 04 Oct 2017 17:19:24 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fofo-edit.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fofo-form.vm

Rev 22533 –

ashik.ali — Wed, 04 Oct 2017 17:18:59 +0530

ashik.ali – 5 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.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/Utils.java

Rev 22532 –

ashik.ali — Wed, 04 Oct 2017 17:18:23 +0530

ashik.ali – 5 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/DistrictMaster.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/FofoStore.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/FofoStoreSequenceGeneration.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Retailer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java

Rev 22531 –

ashik.ali — Wed, 04 Oct 2017 12:07:23 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-web/build.gradle
~ /trunk/profitmandi-web/src/main/resources/META-INF/env.property

Rev 22530 –

ashik.ali — Wed, 04 Oct 2017 12:06:46 +0530

ashik.ali – 3 file(s) modified

~ /trunk/profitmandi-fofo/build.gradle
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemLedgerController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property

Rev 22529 –

ashik.ali — Wed, 04 Oct 2017 12:04:59 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/build.gradle

Rev 22528 – Fixed wallet

amit.gupta — Tue, 03 Oct 2017 18:09:08 +0530

amit.gupta – 1 file(s) modified
Fixed wallet

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment/PaymentUtils.java

Rev 22527 –

amit.gupta — Tue, 03 Oct 2017 15:40:30 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 22526 – Fix if itemLedgers are empty

ashik.ali — Tue, 03 Oct 2017 14:37:28 +0530

ashik.ali – 1 file(s) modified
Fix if itemLedgers are empty

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

Rev 22525 – Added keys for NSSPL

amit.gupta — Tue, 03 Oct 2017 14:03:56 +0530

amit.gupta – 1 file(s) modified
Added keys for NSSPL

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 22524 –

ashik.ali — Tue, 03 Oct 2017 13:15:21 +0530

ashik.ali – 3 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequest.java

Rev 22523 –

ashik.ali — Tue, 03 Oct 2017 13:06:29 +0530

ashik.ali – 6 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemLedgerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.vm

Rev 22522 –

ashik.ali — Tue, 03 Oct 2017 13:04:57 +0530

ashik.ali – 10 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ScanRecord.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemLedgerRow.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ScanRecordRepository.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/stock
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/stock/ItemLedgerService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/stock/ItemLedgerServiceImpl.java

Rev 22521 –

ashik.ali — Tue, 03 Oct 2017 13:02:59 +0530

ashik.ali – 7 file(s) modified

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemCompleteLedgerModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemLedgerModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/LedgerValue.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties

Rev 22520 –

amit.gupta — Tue, 03 Oct 2017 08:49:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java

Rev 22519 –

amit.gupta — Mon, 02 Oct 2017 06:59:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/createcompany.py

Rev 22518 –

amit.gupta — Fri, 29 Sep 2017 19:15:39 +0530

amit.gupta – 1 file(s) modified

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

Rev 22517 –

amit.gupta — Fri, 29 Sep 2017 18:26:22 +0530

amit.gupta – 1 file(s) modified

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

Rev 22516 –

amit.gupta — Fri, 29 Sep 2017 18:16:26 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties

Rev 22515 – Fixed redirects

amit.gupta — Fri, 29 Sep 2017 18:08:38 +0530

amit.gupta – 1 file(s) modified
Fixed redirects

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