SmartDukaan – /

Rev 6385 – Showing All purchases in Purchase Order show page irrespective of ...

amar.kumar — Thu, 29 Nov 2012 12:58:07 +0530

amar.kumar – 4 file(s) modified
Showing All purchases in Purchase Order show page irrespective of State of purchase

Reviewed by Amit Gupta

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 6384 – make the title dynamic.

rajveer — Wed, 28 Nov 2012 08:57:42 +0530

rajveer – 1 file(s) modified
make the title dynamic.

~ /trunk/Website/src/main/webapp/WEB-INF/content/clearance-sale-index.vm

Rev 6383 – make the title dynamic.

rajveer — Wed, 28 Nov 2012 08:57:29 +0530

rajveer – 1 file(s) modified
make the title dynamic.

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

Rev 6382 – Changed order.

rajveer — Tue, 27 Nov 2012 22:53:19 +0530

rajveer – 1 file(s) modified
Changed order.

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

Rev 6381 – Created new page for sony products.

rajveer — Tue, 27 Nov 2012 22:52:52 +0530

rajveer – 1 file(s) modified
Created new page for sony products.

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

Rev 6380 – Changes for 1) Adding recieved timestamp of purchase 2) ...

amar.kumar — Tue, 27 Nov 2012 16:35:27 +0530

amar.kumar – 3 file(s) modified
Changes for
1) Adding recieved timestamp of purchase
2) We have to remove the option of continuing a purchase
3) Stop changing inventory for real warehouses

Reviewed by Amar

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
~ /trunk/PyProj/src/shop2020/purchase/main/model/Purchase.py

Rev 6379 – Removed Nokia models from recharge offer page.

rajveer — Tue, 27 Nov 2012 12:22:31 +0530

rajveer – 1 file(s) modified
Removed Nokia models from recharge offer page.

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm

Rev 6378 – Reverting the helper service hostname and portname to default values

amar.kumar — Mon, 26 Nov 2012 18:52:57 +0530

amar.kumar – 1 file(s) modified
Reverting the helper service hostname and portname to default values

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

Rev 6377 – Added session username.

rajveer — Mon, 26 Nov 2012 17:00:40 +0530

rajveer – 1 file(s) modified
Added session username.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RechargeAvailabilityController.java

Rev 6376 – Changed the password.

rajveer — Mon, 26 Nov 2012 15:52:38 +0530

rajveer – 1 file(s) modified
Changed the password.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RechargeAvailabilityController.java

Rev 6375 – Updated title.

rajveer — Mon, 26 Nov 2012 15:49:06 +0530

rajveer – 1 file(s) modified
Updated title.

~ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-availability-authsuccess.vm

Rev 6374 – Added break in the file.

rajveer — Mon, 26 Nov 2012 15:34:12 +0530

rajveer – 1 file(s) modified
Added break in the file.

~ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-availability-authsuccess.vm

Rev 6373 – Corrected circle id issues.

rajveer — Mon, 26 Nov 2012 15:28:12 +0530

rajveer – 1 file(s) modified
Corrected circle id issues.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RechargeAvailabilityController.java

Rev 6372 – MAde changes for all circles.

rajveer — Mon, 26 Nov 2012 15:03:07 +0530

rajveer – 1 file(s) modified
MAde changes for all circles.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RechargeAvailabilityController.java

Rev 6371 – Added method for service availability.

rajveer — Mon, 26 Nov 2012 14:59:25 +0530

rajveer – 10 file(s) modified
Added method for service availability.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/RechargeAvailabilityController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RechargeOrdersController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-availability-authfail.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-availability-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6370 – Moved back some orders to delhivery.

rajveer — Mon, 26 Nov 2012 10:44:12 +0530

rajveer – 1 file(s) modified
Moved back some orders to delhivery.

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

Rev 6369 – Changed date to Nov 30 as requested by abhishek.

amit.gupta — Thu, 22 Nov 2012 16:03:15 +0530

amit.gupta – 1 file(s) modified
Changed date to Nov 30 as requested by abhishek.

~ /trunk/Website/src/main/webapp/WEB-INF/content/giftvoucher-offer.vm

Rev 6368 – Changed date to Nov 30 as requested by abhishek.

amit.gupta — Thu, 22 Nov 2012 11:48:38 +0530

amit.gupta – 1 file(s) modified
Changed date to Nov 30 as requested by abhishek.

~ /trunk/Website/src/main/webapp/WEB-INF/content/giftvoucher-offer.vm

Rev 6367 – added promotiontype to promotion table

amit.gupta — Wed, 21 Nov 2012 18:39:03 +0530

amit.gupta – 10 file(s) modified
added promotiontype to promotion table

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_discount_to_specific_users.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_gift_voucher_to_specific_users.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 6366 – Correcting url for getting order confirmation mail

amar.kumar — Wed, 21 Nov 2012 11:26:32 +0530

amar.kumar – 1 file(s) modified
Correcting url for getting order confirmation mail

~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 6365 – Changed vat rate in sales report. Its now being picked ...

amit.gupta — Tue, 20 Nov 2012 16:19:42 +0530

amit.gupta – 1 file(s) modified
Changed vat rate in sales report.
Its now being picked up from line item of the order.

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

Rev 6364 – In purchase report do not include DOA_REPLACED.

rajveer — Tue, 20 Nov 2012 15:53:29 +0530

rajveer – 1 file(s) modified
In purchase report do not include DOA_REPLACED.

~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 6363 – Added Super LCD2 to screen.

amit.gupta — Tue, 20 Nov 2012 15:00:02 +0530

amit.gupta – 1 file(s) modified
Added Super LCD2 to screen.

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

Rev 6362 – Group By purchase id.

rajveer — Mon, 19 Nov 2012 17:29:28 +0530

rajveer – 1 file(s) modified
Group By purchase id.

~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 6361 – Added purchase Id against each order.

rajveer — Mon, 19 Nov 2012 17:28:00 +0530

rajveer – 7 file(s) modified
Added purchase Id against each order.

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 6360 –

amit.gupta — Fri, 16 Nov 2012 13:51:47 +0530

amit.gupta – 2 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PromotionsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/promotions-index.vm

Rev 6359 – to remove unwanted inconsistent entity.

amit.gupta — Fri, 16 Nov 2012 13:47:54 +0530

amit.gupta – 1 file(s) modified
to remove unwanted inconsistent entity.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java

Rev 6358 – Updated enum for ios 6

amit.gupta — Thu, 15 Nov 2012 17:33:57 +0530

amit.gupta – 1 file(s) modified
Updated enum for ios 6

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

Rev 6357 – Corrected recharge refund script.

rajveer — Thu, 15 Nov 2012 15:51:45 +0530

rajveer – 1 file(s) modified
Corrected recharge refund script.

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

Rev 6356 – Added method isCodApplicable to Promotion

amit.gupta — Thu, 15 Nov 2012 14:59:16 +0530

amit.gupta – 5 file(s) modified
Added method isCodApplicable to Promotion

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java

Rev 6355 – Added cod to promotion

amit.gupta — Thu, 15 Nov 2012 14:56:37 +0530

amit.gupta – 4 file(s) modified
Added cod to promotion

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py

Rev 6354 – Ammended careers page.

rajveer — Thu, 15 Nov 2012 11:46:23 +0530

rajveer – 1 file(s) modified
Ammended careers page.

~ /trunk/Website/src/main/webapp/WEB-INF/content/careers.vm

Rev 6353 – Remove pickup store option for the amount above 20000 for ...

rajveer — Thu, 15 Nov 2012 11:42:08 +0530

rajveer – 2 file(s) modified
Remove pickup store option for the amount above 20000 for delhi/ncr.

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

Rev 6352 – corrected zone id

anupam.singh — Wed, 14 Nov 2012 20:03:54 +0530

anupam.singh – 1 file(s) modified
corrected zone id

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm

Rev 6351 – corrected zone id

anupam.singh — Wed, 14 Nov 2012 20:00:28 +0530

anupam.singh – 1 file(s) modified
corrected zone id

~ /trunk/Website/src/main/webapp/WEB-INF/content/giftvoucher-offer.vm

Rev 6350 – corrected zone id

anupam.singh — Wed, 14 Nov 2012 19:23:47 +0530

anupam.singh – 1 file(s) modified
corrected zone id

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 6349 – Added a new banner image

anupam.singh — Wed, 14 Nov 2012 19:13:44 +0530

anupam.singh – 1 file(s) modified
Added a new banner image

+ /trunk/Website/src/main/webapp/images/Banner_Recharge_New.jpg

Rev 6348 – Reduced one line break.

rajveer — Wed, 14 Nov 2012 19:10:45 +0530

rajveer – 1 file(s) modified
Reduced one line break.

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

Rev 6347 – Added another openx zone on recharge home page.

anupam.singh — Wed, 14 Nov 2012 19:09:27 +0530

anupam.singh – 2 file(s) modified
Added another openx zone on recharge home page.

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm

Rev 6346 – Return type should be decimal.

rajveer — Wed, 14 Nov 2012 18:27:00 +0530

rajveer – 1 file(s) modified
Return type should be decimal.

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