SmartDukaan – /

Rev 23329 – Retailer Update Panel

ashik.ali — Mon, 05 Feb 2018 12:34:15 +0530

ashik.ali – 30 file(s) modified
Retailer Update Panel

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ScanRecord.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/ItemAvailabilityCache.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/PrivateDealUserAddressId.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/PrivateDealUserAddressMapping.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/fofo/CustomerAddressRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepositoryImpl.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/fofo/InventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InvoiceNumberGenerationSequenceRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PaymentOptionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseRepositoryImpl.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/dao/repository/fofo/SchemeInOutRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.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/inventory/ItemAvailabilityCacheRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventorySnapshotRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/PostOfficeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/PostOfficeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 23328 –

ashik.ali — Mon, 05 Feb 2018 12:28:18 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/UpdateRetailerRequest.java

Rev 23327 –

amit.gupta — Sat, 03 Feb 2018 16:38:57 +0530

amit.gupta – 1 file(s) modified

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

Rev 23326 –

amit.gupta — Sat, 03 Feb 2018 15:09:34 +0530

amit.gupta – 1 file(s) modified

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

Rev 23325 –

amit.gupta — Sat, 03 Feb 2018 15:04:48 +0530

amit.gupta – 1 file(s) modified

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

Rev 23324 –

amit.gupta — Sat, 03 Feb 2018 14:41:35 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-add-options.vm

Rev 23323 –

amit.gupta — Sat, 03 Feb 2018 14:39:57 +0530

amit.gupta – 1 file(s) modified

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

Rev 23322 –

amit.gupta — Sat, 03 Feb 2018 14:30:47 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkAddController.java

Rev 23321 –

amit.gupta — Sat, 03 Feb 2018 13:49:38 +0530

amit.gupta – 1 file(s) modified

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

Rev 23320 –

amit.gupta — Sat, 03 Feb 2018 13:37:06 +0530

amit.gupta – 1 file(s) modified

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

Rev 23319 –

amit.gupta — Sat, 03 Feb 2018 13:29:20 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-add-options.vm

Rev 23318 –

amit.gupta — Sat, 03 Feb 2018 13:20:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-add-options.vm

Rev 23317 –

amit.gupta — Sat, 03 Feb 2018 13:14:55 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkAddController.java

Rev 23316 – Fixed old bugs

amit.gupta — Sat, 03 Feb 2018 12:49:47 +0530

amit.gupta – 2 file(s) modified
Fixed old bugs

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py

Rev 23315 –

amit.gupta — Sat, 03 Feb 2018 12:48:35 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java

Rev 23314 – Fixed

amit.gupta — Sat, 03 Feb 2018 12:48:19 +0530

amit.gupta – 1 file(s) modified
Fixed

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java

Rev 23313 – Added tax rate

amit.gupta — Sat, 03 Feb 2018 12:39:10 +0530

amit.gupta – 8 file(s) modified
Added tax rate

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkAddController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-add-options.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 23312 – Added rquick surface.

amit.gupta — Sat, 03 Feb 2018 10:04:10 +0530

amit.gupta – 1 file(s) modified
Added rquick surface.

~ /trunk/Support/src/main/webapp/WEB-INF/content/pincode.vm

Rev 23311 –

amit.gupta — Fri, 02 Feb 2018 18:51:40 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/NotificationCampaigns/admin_send.ctp

Rev 23310 – Removed old tax methods and fixed tax rates for mobile ...

amit.gupta — Fri, 02 Feb 2018 11:20:51 +0530

amit.gupta – 4 file(s) modified
Removed old tax methods and fixed tax rates for mobile category to 12

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java

Rev 23309 – Changed profitmandi to SmartDukaan

amit.gupta — Fri, 02 Feb 2018 10:29:33 +0530

amit.gupta – 2 file(s) modified
Changed profitmandi to SmartDukaan

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/OtpProcessor.java

Rev 23308 –

ashik.ali — Thu, 01 Feb 2018 19:41:25 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 23307 –

ashik.ali — Thu, 01 Feb 2018 19:40:55 +0530

ashik.ali – 2 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java

Rev 23306 –

ashik.ali — Thu, 01 Feb 2018 19:15:31 +0530

ashik.ali – 5 file(s) modified

Rev 23305 –

ashik.ali — Thu, 01 Feb 2018 19:12:28 +0530

ashik.ali – 1 file(s) modified

+ /trunk/PyProj/src/shop2020/purchase/main/script/allPendingPOs.xls

Rev 23304 –

ashik.ali — Thu, 01 Feb 2018 18:45:32 +0530

ashik.ali – 1 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkAddController.java

Rev 23303 –

amit.gupta — Wed, 31 Jan 2018 18:07:24 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java

Rev 23302 –

amit.gupta — Wed, 31 Jan 2018 17:34:17 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/logistics/service/impl/EcomExpressService.py

Rev 23301 –

ashik.ali — Wed, 31 Jan 2018 16:25:00 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Retailer.java

Rev 23300 – Fixed migration util

amit.gupta — Wed, 31 Jan 2018 15:47:47 +0530

amit.gupta – 5 file(s) modified
Fixed migration util

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Counter.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.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

Rev 23299 –

ashik.ali — Wed, 31 Jan 2018 15:47:36 +0530

ashik.ali – 3 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 23298 –

ashik.ali — Wed, 31 Jan 2018 15:47:12 +0530

ashik.ali – 1 file(s) modified

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

Rev 23297 –

ashik.ali — Wed, 31 Jan 2018 15:46:38 +0530

ashik.ali – 20 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.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/entity/dtr/Api.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Otp.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Permission.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Shop.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/UserRole.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.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/fofo/FofoOrderRepository.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/GenericRepository.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/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/inventory/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 23296 –

ashik.ali — Wed, 31 Jan 2018 15:45:44 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java

Rev 23295 –

ashik.ali — Wed, 31 Jan 2018 13:47:03 +0530

ashik.ali – 25 file(s) modified

+ /profitmandi-scheduler/build.gradle
+ /profitmandi-scheduler/settings.gradle
+ /profitmandi-scheduler/src
+ /profitmandi-scheduler/src/main
+ /profitmandi-scheduler/src/main/java
+ /profitmandi-scheduler/src/main/java/com
+ /profitmandi-scheduler/src/main/java/com/spice
+ /profitmandi-scheduler/src/main/java/com/spice/profitmandi
+ /profitmandi-scheduler/src/main/java/com/spice/profitmandi/dao
+ /profitmandi-scheduler/src/main/java/com/spice/profitmandi/dao/config
+ /profitmandi-scheduler/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
+ /profitmandi-scheduler/src/main/java/com/spice/profitmandi/price
+ /profitmandi-scheduler/src/main/java/com/spice/profitmandi/price/PriceDropScheduler.java
+ /profitmandi-scheduler/src/main/java/com/spice/profitmandi/web
+ /profitmandi-scheduler/src/main/java/com/spice/profitmandi/web/config
+ /profitmandi-scheduler/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
+ /profitmandi-scheduler/src/main/resources
+ /profitmandi-scheduler/src/main/resources/META-INF
+ /profitmandi-scheduler/src/main/resources/META-INF/dev.properties
+ /profitmandi-scheduler/src/main/resources/META-INF/env.property
+ /profitmandi-scheduler/src/main/resources/META-INF/payment-options.json
+ /profitmandi-scheduler/src/main/resources/META-INF/prod.properties
+ /profitmandi-scheduler/src/main/resources/META-INF/staging.properties
+ /profitmandi-scheduler/src/test
+ /profitmandi-scheduler/src/test/java

Rev 23294 – Share project "profitmandi-scheduler" into "https://wush.net/svn/shop2020"

ashik.ali — Wed, 31 Jan 2018 13:41:46 +0530

ashik.ali – 1 file(s) modified
Share project "profitmandi-scheduler" into "https://wush.net/svn/shop2020"

+ /profitmandi-scheduler

Rev 23293 –

amit.gupta — Tue, 30 Jan 2018 18:56:41 +0530

amit.gupta – 1 file(s) modified

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

Rev 23292 –

ashik.ali — Mon, 29 Jan 2018 19:30:55 +0530

ashik.ali – 1 file(s) modified

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

Rev 23291 –

amit.gupta — Mon, 29 Jan 2018 16:21:22 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/NotificationCampaigns/admin_send.ctp

Rev 23290 –

amit.gupta — Mon, 29 Jan 2018 16:09:50 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/NotificationCampaigns/admin_send.ctp