SmartDukaan – /

Rev 22623 – added 7681

amit.gupta — Thu, 12 Oct 2017 20:01:04 +0530

amit.gupta – 1 file(s) modified
added 7681

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

Rev 22622 –

amit.gupta — Thu, 12 Oct 2017 17:23:04 +0530

amit.gupta – 1 file(s) modified

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

Rev 22621 – fixed indexing

amit.gupta — Thu, 12 Oct 2017 17:13:13 +0530

amit.gupta – 2 file(s) modified
fixed indexing

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

Rev 22620 –

ashik.ali — Thu, 12 Oct 2017 16:08:48 +0530

ashik.ali – 1 file(s) modified

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

Rev 22619 –

ashik.ali — Thu, 12 Oct 2017 15:54:30 +0530

ashik.ali – 1 file(s) modified

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

Rev 22618 –

ashik.ali — Thu, 12 Oct 2017 15:35:47 +0530

ashik.ali – 1 file(s) modified

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

Rev 22617 –

ashik.ali — Thu, 12 Oct 2017 13:50:55 +0530

ashik.ali – 1 file(s) modified

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

Rev 22616 –

ashik.ali — Thu, 12 Oct 2017 13:40:19 +0530

ashik.ali – 1 file(s) modified

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

Rev 22615 –

ashik.ali — Thu, 12 Oct 2017 13:36:55 +0530

ashik.ali – 1 file(s) modified

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

Rev 22614 –

ashik.ali — Thu, 12 Oct 2017 13:33:48 +0530

ashik.ali – 1 file(s) modified

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

Rev 22613 –

ashik.ali — Thu, 12 Oct 2017 13:30:14 +0530

ashik.ali – 1 file(s) modified

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

Rev 22612 –

ashik.ali — Thu, 12 Oct 2017 13:27:18 +0530

ashik.ali – 1 file(s) modified

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

Rev 22611 –

ashik.ali — Thu, 12 Oct 2017 13:24:09 +0530

ashik.ali – 1 file(s) modified

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

Rev 22610 –

amit.gupta — Thu, 12 Oct 2017 07:15:15 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java

Rev 22609 –

ashik.ali — Wed, 11 Oct 2017 15:05:55 +0530

ashik.ali – 1 file(s) modified

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

Rev 22608 –

ashik.ali — Wed, 11 Oct 2017 15:03:21 +0530

ashik.ali – 19 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/SchemeTag.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Tag.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/TagType.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/TagType.java@22581)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/TagType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerSchemeTagRepository.java
+ /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
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeTagRepository.java
+ /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/catalog/TagRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagRepositoryImpl.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountRepositoryImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountImpl.java@22602)
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagServiceImpl.java

Rev 22607 –

ashik.ali — Wed, 11 Oct 2017 15:01:56 +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/resources/response-codes.properties

Rev 22606 –

ashik.ali — Wed, 11 Oct 2017 14:54:27 +0530

ashik.ali – 2 file(s) modified

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/UserWalletHistoryResponse.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/UserWalletResponse.java

Rev 22605 –

ashik.ali — Wed, 11 Oct 2017 14:47:47 +0530

ashik.ali – 1 file(s) modified

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

Rev 22604 –

ashik.ali — Wed, 11 Oct 2017 14:45:19 +0530

ashik.ali – 1 file(s) modified

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

Rev 22603 –

amit.gupta — Wed, 11 Oct 2017 12:25:39 +0530

amit.gupta – 1 file(s) modified

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

Rev 22602 –

ashik.ali — Wed, 11 Oct 2017 10:14:33 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountImpl.java

Rev 22601 –

ashik.ali — Tue, 10 Oct 2017 18:10:08 +0530

ashik.ali – 1 file(s) modified

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

Rev 22600 –

ashik.ali — Tue, 10 Oct 2017 18:09:46 +0530

ashik.ali – 6 file(s) modified

+ /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
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SchemeTag.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/SchemeAmountType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerRepositoryImpl.java

Rev 22599 –

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

amit.gupta – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/Test.java

Rev 22598 – Fixed aramex.

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

amit.gupta – 40 file(s) modified
Fixed aramex.

~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/impl/Aramex.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/impl/AramexTest.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Address.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/BasicHttpBinding_Service_1_0Impl.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/BasicHttpBinding_Service_1_0Stub.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/BasicHttpBinding_Service_1_01Impl.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/BasicHttpBinding_Service_1_01Stub.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ClientInfo.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Contact.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/deploy.wsdd
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Dimensions.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/HoldCreationRequest.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/HoldCreationResponse.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/LabelInfo.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/LabelPrintingResponse.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/LastReservedShipmentNumberRangeResponse.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Money.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Party.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Pickup.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/PickupCancelationResponse.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/PickupCreationResponse.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ProcessedPickup.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ProcessedShipment.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ProcessedShipmentAttachment.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ProcessedShipmentAttachmentType.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ProcessedShipmentDetails.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ProcessedShipmentHold.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ReserveRangeResponse.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ScheduledDelivery.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ScheduledDeliveryResponse.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Service_1_0_Service.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Service_1_0_ServiceLocator.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Shipment.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ShipmentCreationRequest.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ShipmentCreationResponse.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ShipmentDetails.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ShipmentItem.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Transaction.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/undeploy.wsdd
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Weight.java

Rev 22597 – Fixed minor issue with config

amit.gupta — Tue, 10 Oct 2017 13:35:22 +0530

amit.gupta – 2 file(s) modified
Fixed minor issue with config

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessBulkBilling.java

Rev 22596 – Added logging at stub

amit.gupta — Tue, 10 Oct 2017 13:03:19 +0530

amit.gupta – 1 file(s) modified
Added logging at stub

~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/BasicHttpBinding_Service_1_0Stub.java

Rev 22595 –

ashik.ali — Tue, 10 Oct 2017 12:06:18 +0530

ashik.ali – 1 file(s) modified

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

Rev 22594 –

ashik.ali — Tue, 10 Oct 2017 11:53:35 +0530

ashik.ali – 1 file(s) modified

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

Rev 22593 –

ashik.ali — Tue, 10 Oct 2017 11:44:54 +0530

ashik.ali – 1 file(s) modified

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

Rev 22592 –

ashik.ali — Tue, 10 Oct 2017 11:04:55 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Rev 22591 –

ashik.ali — Tue, 10 Oct 2017 11:04:02 +0530

ashik.ali – 3 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java

Rev 22590 –

amit.gupta — Tue, 10 Oct 2017 10:31:02 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 22589 – Fixed missing call to bulk processing

amit.gupta — Tue, 10 Oct 2017 09:02:58 +0530

amit.gupta – 1 file(s) modified
Fixed missing call to bulk processing

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessBulkBilling.java

Rev 22588 –

amit.gupta — Tue, 10 Oct 2017 08:33:21 +0530

amit.gupta – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessBulkBilling.java

Rev 22587 –

amit.gupta — Tue, 10 Oct 2017 07:31:49 +0530

amit.gupta – 1 file(s) modified

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

Rev 22586 – Pickup wont change if selfPickup is assigned

amit.gupta — Tue, 10 Oct 2017 07:19:04 +0530

amit.gupta – 1 file(s) modified
Pickup wont change if selfPickup is assigned

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

Rev 22585 – SUPPORT has true value for live

amit.gupta — Mon, 09 Oct 2017 20:51:54 +0530

amit.gupta – 1 file(s) modified
SUPPORT has true value for live

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 22584 –

amit.gupta — Mon, 09 Oct 2017 20:51:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java