SmartDukaan – /

Rev 24072 – Fixed https and attendance issues

amit.gupta — Tue, 04 Sep 2018 11:19:37 +0530

amit.gupta – 25 file(s) modified
Fixed https and attendance issues

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.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/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge-commission.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-vendor.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-warehouse.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items.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/prebooking-listings.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm

Rev 24071 – Live demos should be excluded from purchase through panel.

amit.gupta — Mon, 03 Sep 2018 13:09:37 +0530

amit.gupta – 1 file(s) modified
Live demos should be excluded from purchase through panel.

~ /trunk/PyDTR/src/scripts/FofoSolr.py

Rev 24070 –

amit.gupta — Sun, 02 Sep 2018 14:26:14 +0530

amit.gupta – 1 file(s) modified

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

Rev 24069 –

amit.gupta — Sun, 02 Sep 2018 14:22:33 +0530

amit.gupta – 1 file(s) modified

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

Rev 24068 –

amit.gupta — Sat, 01 Sep 2018 20:50:27 +0530

amit.gupta – 1 file(s) modified

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

Rev 24067 –

amit.gupta — Sat, 01 Sep 2018 18:43:43 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/bootstrap.min.css

Rev 24066 –

amit.gupta — Sat, 01 Sep 2018 18:43:21 +0530

amit.gupta – 4 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 24065 –

amit.gupta — Sat, 01 Sep 2018 16:34:28 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/bootstrap.css

Rev 24064 –

amit.gupta — Sat, 01 Sep 2018 16:03:05 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/bootstrap-theme.css

Rev 24063 –

amit.gupta — Fri, 31 Aug 2018 18:01:21 +0530

amit.gupta – 1 file(s) modified

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

Rev 24062 – Fixed pricing

amit.gupta — Fri, 31 Aug 2018 17:40:19 +0530

amit.gupta – 2 file(s) modified
Fixed pricing

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 24061 – REmoved restriction to duplicate entity

amit.gupta — Fri, 31 Aug 2018 14:57:30 +0530

amit.gupta – 1 file(s) modified
REmoved restriction to duplicate entity

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java

Rev 24060 – Fixed

amit.gupta — Fri, 31 Aug 2018 13:06:59 +0530

amit.gupta – 1 file(s) modified
Fixed

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

Rev 24059 – Added changes related to TagListing.

amit.gupta — Fri, 31 Aug 2018 13:05:52 +0530

amit.gupta – 1 file(s) modified
Added changes related to TagListing.

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

Rev 24058 – Fixed add pricing

amit.gupta — Fri, 31 Aug 2018 12:19:50 +0530

amit.gupta – 2 file(s) modified
Fixed add pricing

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 24057 – Fixed item pricing

amit.gupta — Fri, 31 Aug 2018 11:47:32 +0530

amit.gupta – 2 file(s) modified
Fixed item pricing

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemDescriptionModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java

Rev 24056 – One can add pricing now.

amit.gupta — Fri, 31 Aug 2018 08:18:02 +0530

amit.gupta – 21 file(s) modified
One can add pricing now.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.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-recharge-commission.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-vendor.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-warehouse.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items.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/price-drop.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm

Rev 24055 –

amit.gupta — Fri, 31 Aug 2018 08:06:38 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 24054 –

amit.gupta — Thu, 30 Aug 2018 17:50:03 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java

Rev 24053 –

amit.gupta — Thu, 30 Aug 2018 11:33:07 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/scripts/FofoSolr.py

Rev 24052 – Fixed major issues. 1. Demo can't be billed. 2. Handled ...

amit.gupta — Wed, 29 Aug 2018 16:54:18 +0530

amit.gupta – 21 file(s) modified
Fixed major issues.
1. Demo can't be billed.
2. Handled non-samsung price drop.
3. Mrp Restrictions
4. Dhruv Added to investment report.

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PriceDropModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PriceModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/TagListingRequest.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagRankingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagRankingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.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/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.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/TagListingController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /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/price-drop.vm

Rev 24051 –

amit.gupta — Wed, 29 Aug 2018 14:38:46 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ContentStore/src/xml/model/users.xml

Rev 24050 – Added price drop logic for non-samsung products

amit.gupta — Wed, 29 Aug 2018 12:35:22 +0530

amit.gupta – 1 file(s) modified
Added price drop logic for non-samsung products

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

Rev 24049 –

amit.gupta — Mon, 27 Aug 2018 17:03:47 +0530

amit.gupta – 4 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PriceDropModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 24048 –

amit.gupta — Mon, 27 Aug 2018 16:33:32 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 24047 –

amit.gupta — Mon, 27 Aug 2018 16:32:36 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 24046 –

amit.gupta — Mon, 27 Aug 2018 16:19:37 +0530

amit.gupta – 1 file(s) modified

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

Rev 24045 –

amit.gupta — Sun, 26 Aug 2018 08:54:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-events.js

Rev 24044 –

amit.gupta — Sun, 26 Aug 2018 08:51:28 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-events.js

Rev 24043 –

amit.gupta — Sun, 26 Aug 2018 08:48:40 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-events.js

Rev 24042 –

amit.gupta — Sun, 26 Aug 2018 08:42:44 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-common.js

Rev 24041 –

amit.gupta — Sun, 26 Aug 2018 08:38:15 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 24040 –

amit.gupta — Sun, 26 Aug 2018 08:34:30 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-events.js

Rev 24039 –

amit.gupta — Sun, 26 Aug 2018 08:25:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-events.js

Rev 24038 –

amit.gupta — Sat, 25 Aug 2018 22:30:37 +0530

amit.gupta – 1 file(s) modified

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

Rev 24037 –

amit.gupta — Sat, 25 Aug 2018 22:20:32 +0530

amit.gupta – 1 file(s) modified

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

Rev 24036 –

amit.gupta — Sat, 25 Aug 2018 22:09:17 +0530

amit.gupta – 1 file(s) modified

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

Rev 24035 – Fixed deals

amit.gupta — Fri, 24 Aug 2018 17:22:55 +0530

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

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

Rev 24034 – OK

amit.gupta — Fri, 24 Aug 2018 17:11:48 +0530

amit.gupta – 1 file(s) modified
OK

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

Rev 24033 – fixed data.

amit.gupta — Fri, 24 Aug 2018 16:39:28 +0530

amit.gupta – 5 file(s) modified
fixed data.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/webapp/js/bulk-order-common.js
~ /trunk/Support/src/main/webapp/js/bulk-order-events.js