SmartDukaan – /

Rev 21674 –

amit.gupta — Fri, 09 Jun 2017 14:55:43 +0530

amit.gupta – 1 file(s) modified

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

Rev 21673 – change

rajender — Fri, 09 Jun 2017 12:48:41 +0530

rajender – 11 file(s) modified
change

+ /app/app/proguard-rules.pro
+ /app/gradle
+ /app/gradle.properties
+ /app/gradle/wrapper
+ /app/gradle/wrapper/gradle-wrapper.properties
+ /app/local.properties
+ /app/settings.gradle
+ /app/volley/build.gradle
+ /app/volley/proguard-project.txt
+ /app/volley/proguard.cfg
+ /app/volley/rules.gradle

Rev 21672 – change

rajender — Fri, 09 Jun 2017 12:47:56 +0530

rajender – 1 file(s) modified
change

+ /app/library/build.gradle

Rev 21671 – image

rajender — Fri, 09 Jun 2017 12:46:49 +0530

rajender – 1 file(s) modified
image

+ /app/app/src/main/res/drawable-xxhdpi/splashscreen.jpg

Rev 21670 – image

rajender — Fri, 09 Jun 2017 12:45:46 +0530

rajender – 1 file(s) modified
image

+ /app/app/src/main/res/drawable-xxhdpi/progressbar.gif

Rev 21669 – image

rajender — Fri, 09 Jun 2017 12:44:08 +0530

rajender – 1 file(s) modified
image

+ /app/app/src/main/res/drawable-xxhdpi/login.jpg

Rev 21668 – image

rajender — Fri, 09 Jun 2017 12:43:37 +0530

rajender – 1 file(s) modified
image

+ /app/app/src/main/res/drawable/google.png

Rev 21667 – Fixed Pa

amit.gupta — Fri, 09 Jun 2017 12:27:35 +0530

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

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

Rev 21666 – Fixed controllers related to address

amit.gupta — Fri, 09 Jun 2017 11:13:29 +0530

amit.gupta – 10 file(s) modified
Fixed controllers related to address

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PaymentStatusResponse.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Address.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/FofoItemId.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/AddressRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/AddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 21665 –

amit.gupta — Fri, 09 Jun 2017 08:24:42 +0530

amit.gupta – 1 file(s) modified

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

Rev 21664 –

kshitij.sood — Thu, 08 Jun 2017 15:25:22 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/OrderRepositoryImpl.java

Rev 21663 –

kshitij.sood — Thu, 08 Jun 2017 15:23:11 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/CurrentInventorySnapshotRepositoryImpl.java

Rev 21662 –

kshitij.sood — Thu, 08 Jun 2017 15:22:47 +0530

kshitij.sood – 3 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/CurrentInventorySnapshot.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/CurrentInventorySnapshotRepository.java

Rev 21661 –

ashik.ali — Thu, 08 Jun 2017 15:05:35 +0530

ashik.ali – 1 file(s) modified

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

Rev 21660 –

ashik.ali — Thu, 08 Jun 2017 15:05:20 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/OrderRepository.java

Rev 21659 – Fixed json stream

amit.gupta — Thu, 08 Jun 2017 14:39:45 +0530

amit.gupta – 1 file(s) modified
Fixed json stream

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/util/ResponseSender.java

Rev 21658 – Added repository

amit.gupta — Thu, 08 Jun 2017 13:08:54 +0530

amit.gupta – 1 file(s) modified
Added repository

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

Rev 21657 –

ashik.ali — Wed, 07 Jun 2017 18:53:39 +0530

ashik.ali – 1 file(s) modified

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

Rev 21656 –

ashik.ali — Wed, 07 Jun 2017 18:52:59 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/PurchaseRepositoryImpl.java

Rev 21655 –

ashik.ali — Wed, 07 Jun 2017 18:52:37 +0530

ashik.ali – 1 file(s) modified

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

Rev 21654 –

ashik.ali — Wed, 07 Jun 2017 18:00:45 +0530

ashik.ali – 1 file(s) modified

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

Rev 21653 –

ashik.ali — Wed, 07 Jun 2017 17:57:47 +0530

ashik.ali – 14 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Customer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/LineItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Order.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Purchase.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/InventoryItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/ItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/PurchaseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/InventoryItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/ItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/PurchaseRepository.java

Rev 21652 –

ashik.ali — Wed, 07 Jun 2017 17:53:16 +0530

ashik.ali – 2 file(s) modified

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

Rev 21651 –

amit.gupta — Wed, 07 Jun 2017 13:33:55 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java

Rev 21650 –

amit.gupta — Wed, 07 Jun 2017 11:08:30 +0530

amit.gupta – 1 file(s) modified

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

Rev 21649 – Added Config

amit.gupta — Tue, 06 Jun 2017 23:06:12 +0530

amit.gupta – 3 file(s) modified
Added Config

+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java

Rev 21648 – removed conflicting code

amit.gupta — Tue, 06 Jun 2017 21:50:26 +0530

amit.gupta – 3 file(s) modified
removed conflicting code

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/fofo/api
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/fofo/dao
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/fofo/service

Rev 21647 – These files have moved to dao layer

amit.gupta — Tue, 06 Jun 2017 21:36:46 +0530

amit.gupta – 1 file(s) modified
These files have moved to dao layer

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/fofo/dao/repository

Rev 21646 –

kshitij.sood — Tue, 06 Jun 2017 21:21:28 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21645 –

amit.gupta — Tue, 06 Jun 2017 21:07:27 +0530

amit.gupta – 1 file(s) modified

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

Rev 21644 –

ashik.ali — Tue, 06 Jun 2017 20:58:24 +0530

ashik.ali – 1 file(s) modified

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

Rev 21643 –

ashik.ali — Tue, 06 Jun 2017 20:56:03 +0530

ashik.ali – 10 file(s) modified

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/client
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.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/EntityController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MasterDataController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/enumuration/SchemeType.java

Rev 21642 –

amit.gupta — Tue, 06 Jun 2017 15:01:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/bulk-purchase-show.vm

Rev 21641 –

ashik.ali — Tue, 06 Jun 2017 13:08:23 +0530

ashik.ali – 4 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Order.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/InventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/PurchaseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/PurchaseRepository.java

Rev 21640 –

kshitij.sood — Tue, 06 Jun 2017 03:09:07 +0530

kshitij.sood – 16 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Order.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Purchase.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemIdTypeQuantity.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/InventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/PurchaseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/InventoryItemRepository.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/request/ScanNonSerializedRequest.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm

Rev 21639 –

kshitij.sood — Mon, 05 Jun 2017 23:39:42 +0530

kshitij.sood – 2 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Purchase.java

Rev 21638 –

kshitij.sood — Mon, 05 Jun 2017 23:37:57 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21637 –

kshitij.sood — Mon, 05 Jun 2017 23:37:37 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21636 –

ashik.ali — Mon, 05 Jun 2017 21:14:46 +0530

ashik.ali – 6 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.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/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/request/ScanNonSerializedRequest.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/response/GrnHistory.java

Rev 21635 –

ashik.ali — Mon, 05 Jun 2017 21:13:59 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/OrderRepositoryImpl.java