SmartDukaan – /

Rev 23202 –

ashik.ali — Mon, 15 Jan 2018 17:37:36 +0530

ashik.ali – 18 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/User.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrderItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/PinCodeTagRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerSchemeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerTagRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRoleRepositoryImpl.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/util/MigrationUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 23201 –

ashik.ali — Mon, 15 Jan 2018 17:36:40 +0530

ashik.ali – 4 file(s) modified

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/SearchType.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties

Rev 23200 –

amit.gupta — Mon, 15 Jan 2018 15:45:09 +0530

amit.gupta – 1 file(s) modified

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

Rev 23199 –

amit.gupta — Mon, 15 Jan 2018 14:24:45 +0530

amit.gupta – 1 file(s) modified

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

Rev 23198 –

amit.gupta — Mon, 15 Jan 2018 14:15:45 +0530

amit.gupta – 1 file(s) modified

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

Rev 23197 –

amit.gupta — Mon, 15 Jan 2018 14:13:15 +0530

amit.gupta – 1 file(s) modified

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

Rev 23196 –

amit.gupta — Mon, 15 Jan 2018 14:09:07 +0530

amit.gupta – 1 file(s) modified

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

Rev 23195 –

amit.gupta — Mon, 15 Jan 2018 13:38:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 23194 –

amit.gupta — Fri, 12 Jan 2018 18:15:15 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 23193 –

ashik.ali — Thu, 11 Jan 2018 18:29:59 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-ledger-download.vm

Rev 23192 –

ashik.ali — Thu, 11 Jan 2018 18:29:31 +0530

ashik.ali – 1 file(s) modified

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

Rev 23191 –

ashik.ali — Thu, 11 Jan 2018 15:38:03 +0530

ashik.ali – 3 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerAddressRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerAddressRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/OrderServiceImpl.java

Rev 23190 –

ashik.ali — Thu, 11 Jan 2018 14:47:30 +0530

ashik.ali – 1 file(s) modified

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

Rev 23189 –

ashik.ali — Thu, 11 Jan 2018 14:33:43 +0530

ashik.ali – 1 file(s) modified

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

Rev 23188 –

ashik.ali — Thu, 11 Jan 2018 14:33:18 +0530

ashik.ali – 1 file(s) modified

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

Rev 23187 – changes

rajender — Thu, 11 Jan 2018 12:38:51 +0530

rajender – 7 file(s) modified
changes

+ /app/app/src/main/res/drawable/activate_screen.jpg
+ /app/app/src/main/res/drawable/deals_screen.jpg
+ /app/app/src/main/res/drawable/differ_screen.jpg
+ /app/app/src/main/res/drawable/first_screen.jpg
+ /app/app/src/main/res/drawable/home_page_sc.jpg
+ /app/app/src/main/res/drawable/payment_screen.jpg
+ /app/app/src/main/res/drawable/register_screen.jpg

Rev 23186 – changes

rajender — Thu, 11 Jan 2018 12:20:22 +0530

rajender – 1 file(s) modified
changes

~ /app/app/build.gradle

Rev 23185 – changes

rajender — Thu, 11 Jan 2018 12:19:34 +0530

rajender – 1 file(s) modified
changes

~ /app/app/src/main/java/com/saholic/profittill/main/LoginActivity.java

Rev 23184 – changes

rajender — Thu, 11 Jan 2018 12:18:56 +0530

rajender – 1 file(s) modified
changes

~ /app/app/src/main/java/com/saholic/profittill/main/DealsHomeFragment.java

Rev 23183 – Added handling of fofo for RQuick Surface

amit.gupta — Wed, 10 Jan 2018 20:10:49 +0530

amit.gupta – 3 file(s) modified
Added handling of fofo for RQuick Surface

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 23182 –

amit.gupta — Wed, 10 Jan 2018 20:07:35 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/RQuickLogisticsReconciliation.py

Rev 23181 –

ashik.ali — Wed, 10 Jan 2018 16:59:13 +0530

ashik.ali – 16 file(s) modified

~ /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.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.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.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.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/purchase.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.vm

Rev 23180 –

ashik.ali — Wed, 10 Jan 2018 16:58:13 +0530

ashik.ali – 5 file(s) modified

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

Rev 23179 –

ashik.ali — Wed, 10 Jan 2018 16:51:02 +0530

ashik.ali – 1 file(s) modified

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

Rev 23178 –

ashik.ali — Wed, 10 Jan 2018 16:46:17 +0530

ashik.ali – 1 file(s) modified

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

Rev 23177 –

ashik.ali — Wed, 10 Jan 2018 16:36:48 +0530

ashik.ali – 1 file(s) modified

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

Rev 23176 –

amit.gupta — Wed, 10 Jan 2018 12:24:55 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 23175 – Disable the test cases

ashik.ali — Tue, 09 Jan 2018 13:12:56 +0530

ashik.ali – 1 file(s) modified
Disable the test cases

~ /trunk/profitmandi-fofo/build.gradle

Rev 23174 – remove new grn line, handle missing shipping details with better ...

ashik.ali — Tue, 09 Jan 2018 13:11:58 +0530

ashik.ali – 2 file(s) modified
remove new grn line, handle missing shipping details with better way

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm

Rev 23173 – retailer not found redirect change to login, remove wallet history ...

ashik.ali — Tue, 09 Jan 2018 13:09:29 +0530

ashik.ali – 6 file(s) modified
retailer not found redirect change to login, remove wallet history date and invoice search box, remove new grn line, handle missing shipping details with better way

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/RoleInterceptor.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/WEB-INF/views/ftl/wallet-details.vm
~ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service/generic/GenericServiceTest.java

Rev 23172 – Repository Optimizations, Tax rate implementataion

ashik.ali — Tue, 09 Jan 2018 13:05:52 +0530

ashik.ali – 13 file(s) modified
Repository Optimizations, Tax rate implementataion

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/PinCodeTag.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/PinCodeTagRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerSchemeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerTagRepositoryImpl.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/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/PriceDropIMEIRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 23171 – Added span logo

amit.gupta — Tue, 09 Jan 2018 12:28:54 +0530

amit.gupta – 1 file(s) modified
Added span logo

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

Rev 23170 –

amit.gupta — Mon, 08 Jan 2018 23:14:37 +0530

amit.gupta – 1 file(s) modified

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

Rev 23169 –

amit.gupta — Mon, 08 Jan 2018 23:09:23 +0530

amit.gupta – 1 file(s) modified

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

Rev 23168 –

amit.gupta — Mon, 08 Jan 2018 20:06:37 +0530

amit.gupta – 1 file(s) modified

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

Rev 23167 – Fixed branding for fofo

amit.gupta — Mon, 08 Jan 2018 19:50:34 +0530

amit.gupta – 14 file(s) modified
Fixed branding for fofo

~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
~ /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.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.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.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.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.vm

Rev 23166 – Fixed branding for fofo

amit.gupta — Mon, 08 Jan 2018 19:31:21 +0530

amit.gupta – 7 file(s) modified
Fixed branding for fofo

+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/SmartDukaan-135x45.jpg
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/SmartDukaan-302x102.jpg
~ /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/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fofo-edit.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fofo-form.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm

Rev 23165 – FOFO changed to FOCO

amit.gupta — Mon, 08 Jan 2018 17:08:49 +0530

amit.gupta – 1 file(s) modified
FOFO changed to FOCO

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

Rev 23164 – changed branding color

amit.gupta — Mon, 08 Jan 2018 16:52:05 +0530

amit.gupta – 14 file(s) modified
changed branding color

Rev 23163 –

amit.gupta — Fri, 05 Jan 2018 16:58:11 +0530

amit.gupta – 1 file(s) modified

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java