SmartDukaan – /

Rev 22692 –

amit.gupta — Wed, 18 Oct 2017 15:32:55 +0530

amit.gupta – 1 file(s) modified

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

Rev 22691 –

amit.gupta — Wed, 18 Oct 2017 07:39:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 22690 –

amit.gupta — Wed, 18 Oct 2017 07:18:53 +0530

amit.gupta – 1 file(s) modified

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

Rev 22689 –

amit.gupta — Wed, 18 Oct 2017 07:08:35 +0530

amit.gupta – 1 file(s) modified

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

Rev 22688 –

amit.gupta — Wed, 18 Oct 2017 07:05:10 +0530

amit.gupta – 1 file(s) modified

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

Rev 22687 –

amit.gupta — Wed, 18 Oct 2017 07:01:47 +0530

amit.gupta – 1 file(s) modified

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

Rev 22686 –

amit.gupta — Wed, 18 Oct 2017 06:23:56 +0530

amit.gupta – 1 file(s) modified

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

Rev 22685 –

amit.gupta — Wed, 18 Oct 2017 06:21:50 +0530

amit.gupta – 1 file(s) modified

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

Rev 22684 – Fixed invoice format

amit.gupta — Wed, 18 Oct 2017 06:13:03 +0530

amit.gupta – 3 file(s) modified
Fixed invoice format

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoOrderItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 22683 – Added Amount

amit.gupta — Wed, 18 Oct 2017 05:55:59 +0530

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

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

Rev 22682 – Fixed inventory

amit.gupta — Tue, 17 Oct 2017 20:14:04 +0530

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

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

Rev 22681 – Fixed order proccessing for fofo

amit.gupta — Tue, 17 Oct 2017 18:10:17 +0530

amit.gupta – 6 file(s) modified
Fixed order proccessing for fofo

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsurancePolicyRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsurancePolicyRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 22680 –

amit.gupta — Tue, 17 Oct 2017 18:03:13 +0530

amit.gupta – 1 file(s) modified

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

Rev 22679 –

amit.gupta — Tue, 17 Oct 2017 17:08:29 +0530

amit.gupta – 1 file(s) modified

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

Rev 22678 –

amit.gupta — Tue, 17 Oct 2017 17:05:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 22677 –

amit.gupta — Tue, 17 Oct 2017 16:53:10 +0530

amit.gupta – 1 file(s) modified

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

Rev 22676 –

amit.gupta — Tue, 17 Oct 2017 16:49:13 +0530

amit.gupta – 1 file(s) modified

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

Rev 22675 –

amit.gupta — Tue, 17 Oct 2017 16:15:51 +0530

amit.gupta – 1 file(s) modified

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

Rev 22674 –

amit.gupta — Tue, 17 Oct 2017 12:20:22 +0530

amit.gupta – 1 file(s) modified

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

Rev 22673 –

amit.gupta — Tue, 17 Oct 2017 10:01:39 +0530

amit.gupta – 1 file(s) modified

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

Rev 22672 –

amit.gupta — Tue, 17 Oct 2017 09:59:44 +0530

amit.gupta – 1 file(s) modified

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

Rev 22671 –

amit.gupta — Tue, 17 Oct 2017 09:56:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 22670 –

amit.gupta — Tue, 17 Oct 2017 09:41:38 +0530

amit.gupta – 1 file(s) modified

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

Rev 22669 –

amit.gupta — Tue, 17 Oct 2017 09:29:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 22668 – fixed invoice

amit.gupta — Tue, 17 Oct 2017 09:15:35 +0530

amit.gupta – 4 file(s) modified
fixed invoice

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoOrderItem.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/PdfUtils.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 22667 –

amit.gupta — Tue, 17 Oct 2017 08:38:20 +0530

amit.gupta – 1 file(s) modified

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

Rev 22666 –

amit.gupta — Tue, 17 Oct 2017 06:56:12 +0530

amit.gupta – 1 file(s) modified

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

Rev 22665 –

amit.gupta — Tue, 17 Oct 2017 06:15:39 +0530

amit.gupta – 1 file(s) modified

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

Rev 22664 –

amit.gupta — Tue, 17 Oct 2017 06:11:01 +0530

amit.gupta – 1 file(s) modified

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

Rev 22663 – Discount amount should be deducted

amit.gupta — Tue, 17 Oct 2017 06:04:00 +0530

amit.gupta – 1 file(s) modified
Discount amount should be deducted

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

Rev 22662 –

amit.gupta — Tue, 17 Oct 2017 05:45:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 22661 – fixed js changes

amit.gupta — Tue, 17 Oct 2017 05:27:17 +0530

amit.gupta – 1 file(s) modified
fixed js changes

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

Rev 22660 –

ashik.ali — Mon, 16 Oct 2017 17:39:42 +0530

ashik.ali – 4 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 22659 – Added uttar pradesh

amit.gupta — Mon, 16 Oct 2017 16:13:10 +0530

amit.gupta – 1 file(s) modified
Added uttar pradesh

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm

Rev 22658 – Fixed imports

amit.gupta — Mon, 16 Oct 2017 06:17:47 +0530

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

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagController.java
~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/request/CreateTagRequest.java

Rev 22657 –

amit.gupta — Mon, 16 Oct 2017 05:31:14 +0530

amit.gupta – 1 file(s) modified

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

Rev 22656 –

ashik.ali — Sun, 15 Oct 2017 19:29:19 +0530

ashik.ali – 1 file(s) modified

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

Rev 22655 –

ashik.ali — Sun, 15 Oct 2017 19:02:08 +0530

ashik.ali – 1 file(s) modified

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

Rev 22654 –

ashik.ali — Sun, 15 Oct 2017 18:47:11 +0530

ashik.ali – 3 file(s) modified

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

Rev 22653 –

ashik.ali — Sun, 15 Oct 2017 18:46:06 +0530

ashik.ali – 40 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/RetailerScheme.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/RetailerSchemeTag.java@22602)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/RetailerSchemeTag.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SchemeTag.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/FofoStore.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/FofoStoreSequenceGeneration.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoLineItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/FofoStore.java@22581)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStoreSequenceGeneration.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/FofoStoreSequenceGeneration.java@22581)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItemPricing.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeIn.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInId.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeOut.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeOutId.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWallet.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/PrivateDealUser.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/RetailerSchemeRepository.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerSchemeTagRepository.java@22608)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerSchemeRepositoryImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerSchemeTagRepositoryImpl.java@22608)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerSchemeTagRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerSchemeTagRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeTagRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeTagRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepository.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/InventoryItemRepository.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/SchemeInRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeOutRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeOutRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java