SmartDukaan – /

Rev 27389 –

amit.gupta — Mon, 16 Nov 2020 11:51:15 +0530

amit.gupta – 1 file(s) modified

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

Rev 27388 –

amit.gupta — Mon, 16 Nov 2020 11:44:17 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java

Rev 27387 – scheme change

tejbeer — Fri, 13 Nov 2020 15:12:23 +0530

tejbeer – 1 file(s) modified
scheme change

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

Rev 27386 –

amit.gupta — Thu, 12 Nov 2020 12:07:40 +0530

amit.gupta – 2 file(s) modified

~ /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 27385 –

amit.gupta — Thu, 12 Nov 2020 12:06:38 +0530

amit.gupta – 3 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/recharge-provider-balance.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/recharge-provider-wallet-add-money.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm

Rev 27384 – Removed upper case from form-control

amit.gupta — Thu, 12 Nov 2020 12:05:50 +0530

amit.gupta – 2 file(s) modified
Removed upper case from form-control

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-order-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info.vm

Rev 27383 – Removed upper case from form-control

amit.gupta — Thu, 12 Nov 2020 12:04:43 +0530

amit.gupta – 6 file(s) modified
Removed upper case from form-control

~ /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

Rev 27382 –

amit.gupta — Wed, 11 Nov 2020 10:47:36 +0530

amit.gupta – 1 file(s) modified

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

Rev 27381 –

amit.gupta — Wed, 11 Nov 2020 10:25:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java

Rev 27380 –

amit.gupta — Tue, 10 Nov 2020 18:59:01 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm

Rev 27379 – Added Activation Scheme Logic

amit.gupta — Tue, 10 Nov 2020 18:57:56 +0530

amit.gupta – 1 file(s) modified
Added Activation Scheme Logic

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/SchemePayoutStatus.java

Rev 27378 –

amit.gupta — Tue, 10 Nov 2020 18:57:41 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/InventoryWarehouse.java

Rev 27377 – Added Activation Scheme Logic

amit.gupta — Tue, 10 Nov 2020 18:57:10 +0530

amit.gupta – 10 file(s) modified
Added Activation Scheme Logic

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/SchemeType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java

Rev 27376 – Added new warehouse for punjab

amit.gupta — Mon, 09 Nov 2020 13:15:42 +0530

amit.gupta – 5 file(s) modified
Added new warehouse for punjab

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-edit.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm

Rev 27375 – Added new warehouse for punjab

amit.gupta — Mon, 09 Nov 2020 13:02:57 +0530

amit.gupta – 1 file(s) modified
Added new warehouse for punjab

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

Rev 27374 – Added new warehouse for punjab

amit.gupta — Mon, 09 Nov 2020 13:01:38 +0530

amit.gupta – 2 file(s) modified
Added new warehouse for punjab

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/InventoryMismatchGenerator.java

Rev 27373 –

amit.gupta — Sat, 07 Nov 2020 20:00:20 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/map-index.vm

Rev 27372 –

amit.gupta — Sat, 07 Nov 2020 19:59:13 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/map-index.vm

Rev 27371 –

amit.gupta — Sat, 07 Nov 2020 19:57:04 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/map-index.vm

Rev 27370 –

amit.gupta — Sat, 07 Nov 2020 19:51:23 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/map-index.vm

Rev 27369 –

amit.gupta — Sat, 07 Nov 2020 19:49:50 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/map-index.vm

Rev 27368 –

amit.gupta — Sat, 07 Nov 2020 19:20:11 +0530

amit.gupta – 1 file(s) modified

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

Rev 27367 –

amit.gupta — Sat, 07 Nov 2020 19:03:10 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/GpsLocationRepositoryImpl.java

Rev 27366 – Fixed data

amit.gupta — Sat, 07 Nov 2020 18:44:18 +0530

amit.gupta – 4 file(s) modified
Fixed data

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/GpsLocationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/GpsLocationRepositoryImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MapTrackController.java
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/map-index.vm

Rev 27365 –

amit.gupta — Sat, 07 Nov 2020 13:11:33 +0530

amit.gupta – 1 file(s) modified

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

Rev 27364 –

amit.gupta — Sat, 07 Nov 2020 11:59:34 +0530

amit.gupta – 1 file(s) modified

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

Rev 27363 –

amit.gupta — Sat, 07 Nov 2020 11:12:46 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepositoryImpl.java

Rev 27362 –

amit.gupta — Fri, 06 Nov 2020 13:18:26 +0530

amit.gupta – 1 file(s) modified

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

Rev 27361 –

amit.gupta — Fri, 06 Nov 2020 13:10:59 +0530

amit.gupta – 1 file(s) modified

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

Rev 27360 – change

tejbeer — Fri, 06 Nov 2020 11:08:35 +0530

tejbeer – 2 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java

Rev 27359 – change

tejbeer — Fri, 06 Nov 2020 11:01:05 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27358 – chnage

tejbeer — Fri, 06 Nov 2020 11:00:30 +0530

tejbeer – 1 file(s) modified
chnage

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

Rev 27357 – change

tejbeer — Fri, 06 Nov 2020 10:55:08 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27356 – change

tejbeer — Fri, 06 Nov 2020 10:45:39 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27355 – change

tejbeer — Fri, 06 Nov 2020 10:36:56 +0530

tejbeer – 4 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm

Rev 27354 – change

tejbeer — Thu, 05 Nov 2020 22:16:21 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27353 – change

tejbeer — Thu, 05 Nov 2020 22:06:24 +0530

tejbeer – 1 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java

Rev 27352 – change

tejbeer — Thu, 05 Nov 2020 22:02:40 +0530

tejbeer – 2 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm

Rev 27351 – change

tejbeer — Thu, 05 Nov 2020 21:07:47 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27350 – Addded logic to track location

amit.gupta — Thu, 05 Nov 2020 15:30:50 +0530

amit.gupta – 4 file(s) modified
Addded logic to track location

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/GpsLocation.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/GpsLocationRepository.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LocationRepository.java@27320)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/GpsLocationRepositoryImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LocationRepositoryImpl.java@27320)
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DevicesController.java