SmartDukaan – /

Rev 20640 – Added Provider stubs for logistic Providers Bluedart/Aramex

amit.gupta — Mon, 02 Jan 2017 19:40:13 +0530

amit.gupta – 90 file(s) modified
Added Provider stubs for logistic Providers Bluedart/Aramex

+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/impl
+ /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
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Address.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ArrayOfAttachment.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ArrayOfDimensions.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ArrayOfExistingShipment.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ArrayOfNotification.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ArrayOfPickupItemDetail.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ArrayOfProcessedShipment.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ArrayOfProcessedShipmentHold.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ArrayOfShipment.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ArrayOfShipmentHoldDetails.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ArrayOfShipmentItem.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Attachment.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/BasicHttpBinding_Service_1_0Stub.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/DeliveryInstructions.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Dimensions.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ExistingShipment.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/LabelPrintingRequest.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/LabelPrintingResponse.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/LastReservedShipmentNumberRangeRequest.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/Notification.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/PickupCancelationRequest.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/PickupCancelationResponse.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/PickupCreationRequest.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/PickupCreationResponse.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/PickupItemDetail.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/ProcessedShipmentHold.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ReserveRangeRequest.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/ScheduledDeliveryRequest.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ScheduledDeliveryResponse.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Service_1_0_PortType.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/ShipmentHoldDetails.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ShipmentItem.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ShipmentLabel.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Transaction.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Volume.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Weight.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/impl
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/impl/Bluedart.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/impl/BluedartTest.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/ArrayOfDimension.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/ArrayOfWayBillGenerationRequest.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/ArrayOfWayBillGenerationResponse.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/ArrayOfWayBillGenerationStatus.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/AWBCancelationRequest.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/AWBCancelationResponse.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/BasicHttpBinding_IWayBillGenerationStub.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/CommodityDetail.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/Consignee.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/Dimension.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/IWayBillGeneration.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/ProductType.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/Services.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/Shipper.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/UserProfile.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/WayBillGeneration.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/WayBillGenerationLocator.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/WayBillGenerationRequest.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/WayBillGenerationResponse.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/WayBillGenerationStatus.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/bluedart/stub/WSHttpBinding_IWayBillGenerationStub.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/providers
+ /trunk/ShipDEWebServiceClient/src/main/java/com/providers/logistics
+ /trunk/ShipDEWebServiceClient/src/main/java/com/providers/logistics/Provider.java
+ /trunk/ShipDEWebServiceClient/src/main/java/com/providers/logistics/ProviderFactory.java

Rev 20639 – fixed logic for haryana pincodes

amit.gupta — Fri, 30 Dec 2016 15:04:35 +0530

amit.gupta – 1 file(s) modified
fixed logic for haryana pincodes

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

Rev 20638 – fixed logic for haryana pincodes

amit.gupta — Fri, 30 Dec 2016 13:39:54 +0530

amit.gupta – 1 file(s) modified
fixed logic for haryana pincodes

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

Rev 20637 – Added telangana

amit.gupta — Fri, 30 Dec 2016 13:38:15 +0530

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

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

Rev 20636 –

amit.gupta — Thu, 29 Dec 2016 20:14:19 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/Controller/ShippingsController.php

Rev 20635 –

amit.gupta — Thu, 29 Dec 2016 20:13:50 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileSite/application/config/development/magento.php

Rev 20634 – Updated info

amit.gupta — Thu, 29 Dec 2016 18:14:00 +0530

amit.gupta – 1 file(s) modified
Updated info

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

Rev 20633 – Cod is allowed for now.

amit.gupta — Thu, 29 Dec 2016 16:40:06 +0530

amit.gupta – 1 file(s) modified
Cod is allowed for now.

~ /trunk/DtrMobileAppDashboard/app/Controller/ShippingsController.php

Rev 20632 – Added

amit.gupta — Thu, 29 Dec 2016 01:56:52 +0530

amit.gupta – 1 file(s) modified
Added

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java

Rev 20631 – removed comments

amit.gupta — Thu, 29 Dec 2016 01:14:00 +0530

amit.gupta – 1 file(s) modified
removed comments

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java

Rev 20630 –

amit.gupta — Thu, 29 Dec 2016 00:17:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java

Rev 20629 –

amit.gupta — Thu, 29 Dec 2016 00:11:10 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayuPayController.java

Rev 20628 –

amit.gupta — Wed, 28 Dec 2016 21:00:44 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayuPayController.java

Rev 20627 –

amit.gupta — Wed, 28 Dec 2016 20:57:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayuPayController.java

Rev 20626 – fixed amount to 2 for testing purpose

amit.gupta — Wed, 28 Dec 2016 20:50:51 +0530

amit.gupta – 1 file(s) modified
fixed amount to 2 for testing purpose

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayuPayController.java

Rev 20625 – Fixed shipping price as discussed

amit.gupta — Wed, 28 Dec 2016 20:35:55 +0530

amit.gupta – 1 file(s) modified
Fixed shipping price as discussed

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayOptionsController.java

Rev 20624 – Added auth fix

amit.gupta — Wed, 28 Dec 2016 20:19:33 +0530

amit.gupta – 1 file(s) modified
Added auth fix

~ /trunk/MobileSite/application/widgets/auth/controllers/auth.php

Rev 20623 – fixed js path

amit.gupta — Wed, 28 Dec 2016 17:35:06 +0530

amit.gupta – 5 file(s) modified
fixed js path

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-new.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-receive-new.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-receive-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-show.vm

Rev 20622 – fixed checkout for payu

amit.gupta — Wed, 28 Dec 2016 15:32:23 +0530

amit.gupta – 1 file(s) modified
fixed checkout for payu

~ /trunk/MobileSite/application/widgets/checkout/controllers/checkout.php

Rev 20621 – Fixed order

amit.gupta — Wed, 28 Dec 2016 14:34:35 +0530

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

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

Rev 20620 – Added pay success page

amit.gupta — Wed, 28 Dec 2016 12:49:22 +0530

amit.gupta – 1 file(s) modified
Added pay success page

~ /trunk/MobileSite/application/config/routes.php

Rev 20619 – Reverted

amit.gupta — Wed, 28 Dec 2016 12:47:09 +0530

amit.gupta – 1 file(s) modified
Reverted

~ /trunk/MobileSite/application/config/development/config.php

Rev 20618 –

amit.gupta — Wed, 28 Dec 2016 12:45:39 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileSite/application/config/magento.php

Rev 20617 – Added magento changes

amit.gupta — Wed, 28 Dec 2016 12:45:11 +0530

amit.gupta – 2 file(s) modified
Added magento changes

~ /trunk/MobileSite/application/config/development/config.php
~ /trunk/MobileSite/application/config/development/magento.php

Rev 20616 – Added new logic for shipping cost calculation

amit.gupta — Wed, 28 Dec 2016 11:07:22 +0530

amit.gupta – 1 file(s) modified
Added new logic for shipping cost calculation

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

Rev 20615 – Added manual credit logic

amit.gupta — Tue, 27 Dec 2016 10:14:27 +0530

amit.gupta – 1 file(s) modified
Added manual credit logic

~ /trunk/PyDTR/src/dtr/main.py

Rev 20614 –

amit.gupta — Mon, 26 Dec 2016 19:52:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/Controller/ShippingsController.php

Rev 20613 – changes related to bigutsav

amit.gupta — Mon, 26 Dec 2016 19:52:15 +0530

amit.gupta – 5 file(s) modified
changes related to bigutsav

~ /trunk/DtrMobileAppDashboard/app/Config/dev.php
~ /trunk/DtrMobileAppDashboard/app/Config/live.php
~ /trunk/DtrMobileAppDashboard/app/Controller/AppController.php
~ /trunk/DtrMobileAppDashboard/app/View/Shippings/add.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Shippings/index.ctp

Rev 20612 – added payu new key for adonis

amit.gupta — Mon, 26 Dec 2016 19:43:51 +0530

amit.gupta – 1 file(s) modified
added payu new key for adonis

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

Rev 20611 – changes related to bigutsav

amit.gupta — Mon, 26 Dec 2016 18:42:34 +0530

amit.gupta – 1 file(s) modified
changes related to bigutsav

~ /trunk/DtrMobileAppDashboard/app/Config/staging.php

Rev 20610 – Added changes related to bigutsav.

amit.gupta — Mon, 26 Dec 2016 18:04:08 +0530

amit.gupta – 2 file(s) modified
Added changes related to bigutsav.

~ /trunk/MobileSite/application/config/development/magento.php
~ /trunk/MobileSite/application/models/magento_model.php

Rev 20609 – Added changes related to bigutsav.

amit.gupta — Mon, 26 Dec 2016 17:57:45 +0530

amit.gupta – 8 file(s) modified
Added changes related to bigutsav.

~ /trunk/MobileSite/application/config/magento.php
~ /trunk/MobileSite/application/config/routes.php
+ /trunk/MobileSite/application/views/layout/footer_big.php
+ /trunk/MobileSite/application/views/layout/header_big.php
+ /trunk/MobileSite/application/views/layout/layout_bigutsav.php
~ /trunk/MobileSite/application/widgets/checkout/controllers/checkout.php
~ /trunk/MobileSite/application/widgets/checkout/models/checkout_model.php
+ /trunk/MobileSite/application/widgets/checkout/views/payment_process1.php

Rev 20608 –

amit.gupta — Mon, 26 Dec 2016 15:24:17 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java

Rev 20607 –

amit.gupta — Mon, 26 Dec 2016 15:04:38 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java

Rev 20606 –

amit.gupta — Mon, 26 Dec 2016 14:58:23 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java

Rev 20605 –

amit.gupta — Mon, 26 Dec 2016 14:28:39 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java

Rev 20604 –

amit.gupta — Mon, 26 Dec 2016 14:12:20 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Website/src/main/resources/log4j.properties

Rev 20603 – Fixed logging

amit.gupta — Mon, 26 Dec 2016 14:10:41 +0530

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

~ /trunk/MobileWebsiteApi/src/main/resources/log4j.properties

Rev 20602 – Facebook login enabled.

amit.gupta — Mon, 26 Dec 2016 13:46:45 +0530

amit.gupta – 1 file(s) modified
Facebook login enabled.

~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm

Rev 20601 – Only prod1 is for sales. Rest is off

amit.gupta — Mon, 26 Dec 2016 12:07:03 +0530

amit.gupta – 2 file(s) modified
Only prod1 is for sales.
Rest is off

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