SmartDukaan – /

Rev 22173 – Fixed profitmandi-web first time live.

amit.gupta — Mon, 31 Jul 2017 02:58:00 +0530

amit.gupta – 8 file(s) modified
Fixed profitmandi-web first time live.

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MasterDataController.java
~ /trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/staging.properties

Rev 22172 – Fixed mongo

amit.gupta — Mon, 31 Jul 2017 02:31:50 +0530

amit.gupta – 3 file(s) modified
Fixed mongo

~ /trunk/profitmandi-dao/pom.xml
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 22171 – Moved mongo config to profitmandi-fofo

amit.gupta — Mon, 31 Jul 2017 02:04:45 +0530

amit.gupta – 2 file(s) modified
Moved mongo config to profitmandi-fofo

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 22170 –

amit.gupta — Mon, 31 Jul 2017 02:00:24 +0530

amit.gupta – 1 file(s) modified

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

Rev 22169 –

amit.gupta — Mon, 31 Jul 2017 01:49:25 +0530

amit.gupta – 1 file(s) modified

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

Rev 22168 –

amit.gupta — Sun, 30 Jul 2017 23:26:33 +0530

amit.gupta – 1 file(s) modified

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

Rev 22167 –

amit.gupta — Sun, 30 Jul 2017 23:25:04 +0530

amit.gupta – 1 file(s) modified

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

Rev 22166 –

amit.gupta — Sun, 30 Jul 2017 23:15:39 +0530

amit.gupta – 1 file(s) modified

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

Rev 22165 –

amit.gupta — Sun, 30 Jul 2017 23:03:05 +0530

amit.gupta – 2 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 22164 –

amit.gupta — Sun, 30 Jul 2017 22:49:11 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties

Rev 22163 –

amit.gupta — Sun, 30 Jul 2017 22:42:03 +0530

amit.gupta – 1 file(s) modified

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

Rev 22162 – Mongo is now Spring Component

amit.gupta — Sun, 30 Jul 2017 22:33:38 +0530

amit.gupta – 8 file(s) modified
Mongo is now Spring Component

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/ContentPojoPopulator.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MongoMigrationUtil.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FofoController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RegisterController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties

Rev 22161 –

amit.gupta — Sun, 30 Jul 2017 20:59:49 +0530

amit.gupta – 1 file(s) modified

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

Rev 22160 –

amit.gupta — Sun, 30 Jul 2017 19:06:30 +0530

amit.gupta – 1 file(s) modified

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

Rev 22159 –

amit.gupta — Sun, 30 Jul 2017 19:03:16 +0530

amit.gupta – 1 file(s) modified

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

Rev 22158 –

amit.gupta — Sun, 30 Jul 2017 18:54:01 +0530

amit.gupta – 1 file(s) modified

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

Rev 22157 –

amit.gupta — Sun, 30 Jul 2017 18:44:41 +0530

amit.gupta – 1 file(s) modified

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

Rev 22156 –

amit.gupta — Sun, 30 Jul 2017 18:36:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 22155 – Added methods

amit.gupta — Sun, 30 Jul 2017 16:36:54 +0530

amit.gupta – 7 file(s) modified
Added methods

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RegisterController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/fofo-form/js/reqformvalidator.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fofo-edit.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fofo-form.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fofo-thankyou.vm

Rev 22154 –

amit.gupta — Sun, 30 Jul 2017 15:39:49 +0530

amit.gupta – 1 file(s) modified

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

Rev 22153 –

amit.gupta — Sun, 30 Jul 2017 14:41:42 +0530

amit.gupta – 1 file(s) modified

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

Rev 22152 –

amit.gupta — Sun, 30 Jul 2017 13:10:44 +0530

amit.gupta – 1 file(s) modified

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

Rev 22151 –

amit.gupta — Sun, 30 Jul 2017 11:26:06 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.java

Rev 22150 –

amit.gupta — Sun, 30 Jul 2017 11:13:04 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java

Rev 22149 –

amit.gupta — Sun, 30 Jul 2017 11:11:02 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java

Rev 22148 – Fixed logic for form saving

amit.gupta — Sun, 30 Jul 2017 09:53:05 +0530

amit.gupta – 5 file(s) modified
Fixed logic for form saving

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/fofo-form/js/reqformvalidator.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fofo-form.vm

Rev 22147 – Fixed logistics, bluedart disabled

amit.gupta — Sat, 29 Jul 2017 13:59:32 +0530

amit.gupta – 1 file(s) modified
Fixed logistics, bluedart disabled

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

Rev 22146 –

amit.gupta — Sat, 29 Jul 2017 13:10:46 +0530

amit.gupta – 1 file(s) modified

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

Rev 22145 –

amit.gupta — Sat, 29 Jul 2017 13:07:15 +0530

amit.gupta – 1 file(s) modified

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

Rev 22144 –

amit.gupta — Sat, 29 Jul 2017 10:51:22 +0530

amit.gupta – 1 file(s) modified

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

Rev 22143 –

amit.gupta — Sat, 29 Jul 2017 10:49:38 +0530

amit.gupta – 1 file(s) modified

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

Rev 22142 –

amit.gupta — Sat, 29 Jul 2017 10:47:59 +0530

amit.gupta – 1 file(s) modified

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

Rev 22141 –

amit.gupta — Sat, 29 Jul 2017 09:42:21 +0530

amit.gupta – 1 file(s) modified

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

Rev 22140 – Fixed email

amit.gupta — Sat, 29 Jul 2017 00:52:49 +0530

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

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

Rev 22139 – Fixed fofo admin

amit.gupta — Sat, 29 Jul 2017 00:29:59 +0530

amit.gupta – 22 file(s) modified
Fixed fofo admin

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.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/PurchaseController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RegisterController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/RoleInterceptor.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/model/FofoDetails.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/model/LoginDetails.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/model/FofoDetails.java@22126)
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/Utils.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fofo-form.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/response.vm

Rev 22138 – Fixed shipper

amit.gupta — Fri, 28 Jul 2017 12:52:51 +0530

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

~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/impl/Aramex.java

Rev 22137 – commit

rajender — Fri, 28 Jul 2017 12:40:34 +0530

rajender – 5 file(s) modified
commit

+ /app/app/src/main/res/values-w820dp
+ /app/app/src/main/res/values-w820dp/dimens.xml
+ /app/app/src/main/res/values/dimens.xml
+ /app/app/src/main/res/values/ids.xml
+ /app/app/src/main/res/values/strings.xml

Rev 22136 – commit

rajender — Fri, 28 Jul 2017 12:28:39 +0530

rajender – 5 file(s) modified
commit

~ /app/app/src/main/res/menu/menu_login.xml
~ /app/app/src/main/res/menu/menu_main.xml
~ /app/app/src/main/res/menu/menu_splash_screen.xml
~ /app/app/src/main/res/values-v21/styles.xml
~ /app/app/src/main/res/values/styles.xml

Rev 22135 – commit

rajender — Fri, 28 Jul 2017 12:28:01 +0530

rajender – 4 file(s) modified
commit

~ /app/app/src/main/res/layout/activity_login.xml
~ /app/app/src/main/res/layout/activity_main.xml
~ /app/app/src/main/res/layout/activity_splash_screen.xml
~ /app/app/src/main/res/layout/fragment_deals_home.xml

Rev 22134 – commit

rajender — Fri, 28 Jul 2017 12:27:18 +0530

rajender – 1 file(s) modified
commit

+ /app/app/src/main/res/drawable/symbol.png