SmartDukaan – //trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history-paginated.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 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

Rev 21987 –

kshitij.sood — Tue, 18 Jul 2017 13:08:51 +0530

kshitij.sood – 27 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/SpringWebAppInitializer.java
+ /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/LoginController.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/ScanRecordController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/response/ValidateCart.java
~ /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/images/no_image_available.png
~ /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/bad-inventory-snapshot.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/cart.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/current-item-availability.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-details.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/purchase.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/test.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/validate-cart.vm