SmartDukaan – /

Rev 8994 – Assignwarehouse id for flipkart

vikram.raghav — Fri, 06 Dec 2013 11:35:53 +0530

vikram.raghav – 1 file(s) modified
Assignwarehouse id for flipkart

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

Rev 8993 –

manish.sharma — Fri, 06 Dec 2013 11:17:07 +0530

manish.sharma – 66 file(s) modified

+ /trunk/AdwordsService
+ /trunk/AdwordsService/.classpath
+ /trunk/AdwordsService/.project
+ /trunk/AdwordsService/pom.xml
+ /trunk/AdwordsService/src
+ /trunk/AdwordsService/src/main
+ /trunk/AdwordsService/src/main/java
+ /trunk/AdwordsService/src/main/java/in
+ /trunk/AdwordsService/src/main/java/in/shop2020
+ /trunk/AdwordsService/src/main/java/in/shop2020/googleadwords
+ /trunk/AdwordsService/src/main/resources
+ /trunk/AdwordsService/src/main/resources/context.xml
+ /trunk/AdwordsService/src/main/resources/in
+ /trunk/AdwordsService/src/main/resources/in/shop2020
+ /trunk/AdwordsService/src/main/resources/in/shop2020/googleadwords
+ /trunk/AdwordsService/src/main/resources/in/shop2020/googleadwords/persistence
+ /trunk/AdwordsService/src/main/resources/in/shop2020/googleadwords/persistence/AdwordsAdGroupAdMapper.xml
+ /trunk/AdwordsService/src/main/resources/in/shop2020/googleadwords/persistence/AdwordsAdGroupMapper.xml
+ /trunk/AdwordsService/src/main/resources/in/shop2020/googleadwords/persistence/AdwordsAdKeywordMapper.xml
+ /trunk/AdwordsService/src/main/resources/in/shop2020/googleadwords/persistence/AdwordsCampaignMapper.xml
+ /trunk/AdwordsService/src/main/resources/jdbc.properties
+ /trunk/AdwordsService/src/main/resources/log4j.properties
+ /trunk/AdwordsService/src/main/resources/mybatis-config.xml
+ /trunk/AdwordsService/target
+ /trunk/AdwordsService/target/AdwordsService-1.0-SNAPSHOT.jar
+ /trunk/AdwordsService/target/classes
+ /trunk/AdwordsService/target/classes/context.xml
+ /trunk/AdwordsService/target/classes/in
+ /trunk/AdwordsService/target/classes/in/shop2020
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/domain
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/domain/AdwordsAdGroup.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/domain/AdwordsAdGroupAd.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/domain/AdwordsAdKeyword.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/domain/AdwordsCampaign.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/handler
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/handler/AdwordsAdGroupAdHandler.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/handler/AdwordsAdGroupHandler.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/handler/AdwordsAdKeywordHandler.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/handler/AdwordsCampaignHandler.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/persistence
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/persistence/AdwordsAdGroupAdMapper.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/persistence/AdwordsAdGroupAdMapper.xml
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/persistence/AdwordsAdGroupMapper.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/persistence/AdwordsAdGroupMapper.xml
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/persistence/AdwordsAdKeywordMapper.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/persistence/AdwordsAdKeywordMapper.xml
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/persistence/AdwordsCampaignMapper.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/persistence/AdwordsCampaignMapper.xml
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/service
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/service/AdwordsServer.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/service/handler
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/service/handler/AdwordsServiceHandler.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/util
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/util/AdwordsSaholicAdGroupSync.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/util/AdwordsSaholicAdKeywordsSync.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/util/AdwordsSaholicCampaignSync.class
+ /trunk/AdwordsService/target/classes/in/shop2020/googleadwords/util/AdwordsSaholicTextAdsSync.class
+ /trunk/AdwordsService/target/classes/jdbc.properties
+ /trunk/AdwordsService/target/classes/log4j.properties
+ /trunk/AdwordsService/target/classes/mybatis-config.xml
+ /trunk/AdwordsService/target/generated-sources
+ /trunk/AdwordsService/target/generated-sources/annotations
+ /trunk/AdwordsService/target/maven-archiver
+ /trunk/AdwordsService/target/maven-archiver/pom.properties
+ /trunk/AdwordsService/target/surefire

Rev 8992 – Adding font support for Flipkart courier Ekart

amar.kumar — Fri, 06 Dec 2013 11:05:29 +0530

amar.kumar – 1 file(s) modified
Adding font support for Flipkart courier Ekart

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

Rev 8991 – Flipkart Orders to be processed even if it is split ...

vikram.raghav — Fri, 06 Dec 2013 10:57:28 +0530

vikram.raghav – 1 file(s) modified
Flipkart Orders to be processed even if it is split into lines

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

Rev 8990 – Created method getflipkartorder to be used in om dashboard

vikram.raghav — Fri, 06 Dec 2013 10:43:59 +0530

vikram.raghav – 7 file(s) modified
Created method getflipkartorder to be used in om dashboard

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8989 – Added invoice changes for flipkart

vikram.raghav — Fri, 06 Dec 2013 10:33:28 +0530

vikram.raghav – 1 file(s) modified
Added invoice changes for flipkart

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

Rev 8988 – Added font size for flipkart courier

vikram.raghav — Thu, 05 Dec 2013 18:20:16 +0530

vikram.raghav – 1 file(s) modified
Added font size for flipkart courier

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

Rev 8987 – adding float:none to container div because slidy.css file was moved ...

anupam.singh — Thu, 05 Dec 2013 17:36:27 +0530

anupam.singh – 1 file(s) modified
adding float:none to container div because slidy.css file was moved to global scope and it was causing the whole page to float leftwards.

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

Rev 8986 – accept order if logistic provider id is > 7

vikram.raghav — Thu, 05 Dec 2013 16:59:22 +0530

vikram.raghav – 1 file(s) modified
accept order if logistic provider id is > 7

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

Rev 8985 – Accepted order and do nothing if the order source is ...

vikram.raghav — Thu, 05 Dec 2013 15:37:08 +0530

vikram.raghav – 1 file(s) modified
Accepted order and do nothing if the order source is flipkart

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

Rev 8984 – Tomcat need not require to stop.

amit.gupta — Thu, 05 Dec 2013 15:28:03 +0530

amit.gupta – 1 file(s) modified
Tomcat need not require to stop.

~ /trunk/runutils/generate-content-from-cms.sh

Rev 8983 –

vikram.raghav — Thu, 05 Dec 2013 14:05:17 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8982 – Added Flipkart Order Source in Order Sevice thrift

vikram.raghav — Thu, 05 Dec 2013 13:48:14 +0530

vikram.raghav – 4 file(s) modified
Added Flipkart Order Source in Order Sevice thrift

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8981 – Fixed style related issue due to recharge css/

kshitij.sood — Thu, 05 Dec 2013 13:02:51 +0530

kshitij.sood – 1 file(s) modified
Fixed style related issue due to recharge css/

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

Rev 8980 –

vikram.raghav — Thu, 05 Dec 2013 12:45:37 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-options.vm

Rev 8979 –

vikram.raghav — Thu, 05 Dec 2013 12:36:57 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-options.vm

Rev 8978 – Emi index page

kshitij.sood — Thu, 05 Dec 2013 12:32:33 +0530

kshitij.sood – 1 file(s) modified
Emi index page

+ /trunk/Website/src/main/webapp/WEB-INF/content/emi-info-index.vm

Rev 8977 – Added mobile type.

amit.gupta — Thu, 05 Dec 2013 12:20:37 +0530

amit.gupta – 1 file(s) modified
Added mobile type.

~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java

Rev 8976 – Emi Controller and changes in cart widget to render plans ...

kshitij.sood — Thu, 05 Dec 2013 12:18:18 +0530

kshitij.sood – 3 file(s) modified
Emi Controller and changes in cart widget to render plans from json.

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EmiInfoController.java
~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 8975 – Added mobile type.

amit.gupta — Thu, 05 Dec 2013 12:11:18 +0530

amit.gupta – 1 file(s) modified
Added mobile type.

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 8974 –

vikram.raghav — Thu, 05 Dec 2013 11:57:41 +0530

vikram.raghav – 1 file(s) modified

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

Rev 8973 – Added Buyer name from flipkart to order attributes.

vikram.raghav — Thu, 05 Dec 2013 11:37:58 +0530

vikram.raghav – 3 file(s) modified
Added Buyer name from flipkart to order attributes.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-options.vm

Rev 8972 – Changed Order status to submitted for processing (flipkart)

vikram.raghav — Thu, 05 Dec 2013 08:09:50 +0530

vikram.raghav – 1 file(s) modified
Changed Order status to submitted for processing (flipkart)

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

Rev 8971 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 23:50:57 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

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

Rev 8970 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 23:32:12 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

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

Rev 8969 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 23:30:29 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

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

Rev 8968 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 22:59:49 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

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

Rev 8967 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 22:54:50 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

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

Rev 8966 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 22:49:21 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

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

Rev 8965 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 22:15:21 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

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

Rev 8964 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 21:21:51 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

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

Rev 8963 – Changes to create Flipkart Order.

vikram.raghav — Wed, 04 Dec 2013 20:14:11 +0530

vikram.raghav – 1 file(s) modified
Changes to create Flipkart Order.

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

Rev 8962 – Changes to create Flipkart Order.

vikram.raghav — Wed, 04 Dec 2013 20:11:53 +0530

vikram.raghav – 1 file(s) modified
Changes to create Flipkart Order.

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

Rev 8961 – Changes to create Flipkart Order.

vikram.raghav — Wed, 04 Dec 2013 20:03:46 +0530

vikram.raghav – 14 file(s) modified
Changes to create Flipkart Order.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/pom.xml
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-options.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-upload-orders.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FlipkartOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8960 – Made the changes

rajveer — Wed, 04 Dec 2013 19:44:34 +0530

rajveer – 1 file(s) modified
Made the changes

~ /trunk/Website/src/main/webapp/js/entity.js

Rev 8959 – Added held inventory logic for amazon inventory feeds

vikram.raghav — Wed, 04 Dec 2013 19:42:36 +0530

vikram.raghav – 1 file(s) modified
Added held inventory logic for amazon inventory feeds

~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 8958 – Added held inventory logic for amazon inventory feeds

vikram.raghav — Wed, 04 Dec 2013 19:40:55 +0530

vikram.raghav – 1 file(s) modified
Added held inventory logic for amazon inventory feeds

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java

Rev 8957 – Made the changes

rajveer — Wed, 04 Dec 2013 19:40:04 +0530

rajveer – 1 file(s) modified
Made the changes

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

Rev 8956 – Made the changes

rajveer — Wed, 04 Dec 2013 19:38:21 +0530

rajveer – 1 file(s) modified
Made the changes

~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 8955 – Added held inventory logic for amazon inventory feeds

vikram.raghav — Wed, 04 Dec 2013 19:36:52 +0530

vikram.raghav – 2 file(s) modified
Added held inventory logic for amazon inventory feeds

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py