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

Rev 23556 – Updated recharge commissions

amit.gupta — Fri, 13 Apr 2018 17:18:42 +0530

amit.gupta – 9 file(s) modified
Updated recharge commissions

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeCommission.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeCommissionRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/recharge-commissions-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/recharge-commissions.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm

Rev 23506 – Added changes related to Schemes

amit.gupta — Thu, 05 Apr 2018 07:44:19 +0530

amit.gupta – 12 file(s) modified
Added changes related to Schemes

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CronController.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/CookiesProcessor.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/approved-returns.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/returnables.vm

Rev 23419 – New feature: Prebooking Listing, Prebooking Orders, link with orders, order ...

ashik.ali — Tue, 13 Mar 2018 16:03:52 +0530

ashik.ali – 31 file(s) modified
New feature: Prebooking Listing, Prebooking Orders, link with orders, order details

~ /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/PaymentOptionController.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/SchemeController.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/resources/js/create-scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/prebooking.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet.js
+ /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
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /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/order-index.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listing-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
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/tag-listing-items-description.vm

Rev 23343 – $insurancePolicy.getInsuranceProvider().getName() in Order Detail Show Schemes active and then expired ...

ashik.ali — Thu, 08 Feb 2018 19:19:30 +0530

ashik.ali – 28 file(s) modified
$insurancePolicy.getInsuranceProvider().getName() in Order Detail
Show Schemes active and then expired to Partners as well. Show expiry date as well
Optimized js with async true and catagorized
and some bugs

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/loading.gif
+ /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/contact.js (copied from /trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js@23340)
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer-details.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.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-grn.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm

Rev 23271 –

ashik.ali — Wed, 24 Jan 2018 16:57:24 +0530

ashik.ali – 2 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/controller/SchemeController.java

Rev 23020 –

ashik.ali — Thu, 07 Dec 2017 12:46:45 +0530

ashik.ali – 2 file(s) modified

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

Rev 22927 –

ashik.ali — Wed, 15 Nov 2017 11:59:05 +0530

ashik.ali – 17 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CustomerController.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/FofoController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/GrnHistoryController.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/ItemLedgerController.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/MongoMigrationController.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/PurchaseController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RegisterController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.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/WalletController.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

Rev 22860 –

ashik.ali — Tue, 07 Nov 2017 16:42:13 +0530

ashik.ali – 48 file(s) modified

~ /trunk/profitmandi-fofo/build.gradle
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CustomerController.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/InventoryController.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/ScanRecordController.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/WalletController.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/request
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/response/CheckItemQuantityResponse.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/response/ItemIdQuantityAvailability.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/response/Quantity.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/Utils.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/resources/js/scheme.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin-dashboard-home-content.vm
~ /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/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
+ /trunk/profitmandi-fofo/src/test
+ /trunk/profitmandi-fofo/src/test/java
+ /trunk/profitmandi-fofo/src/test/java/com
+ /trunk/profitmandi-fofo/src/test/java/com/spice
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service/scheme
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service/scheme/SchemeServiceTest.java
+ /trunk/profitmandi-fofo/src/test/resources
+ /trunk/profitmandi-fofo/src/test/resources/log4j.xml
+ /trunk/profitmandi-fofo/src/test/resources/META-INF
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/dev.properties
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/env.property
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/payment-options.json
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/prod.properties
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/staging.properties