Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
37400 45 d 22 h amit /trunk/profitmandi-fofo/src/main/ Merge the three sale-invoice download endpoints into /invoice/download

generateInvoice, generateInvoices and downloadInvoices differed only in how they
resolved the order ids and who was allowed to ask; everything after that was the
same. That drift meant only the single-order download stapled the policy
certificates, so the same invoice pulled from sale history came out without
them. One handler now selects by orderId, partner date range (admin only) or the
caller's own sale-history search, over reusable resolvers plus a shared
render-and-respond step. The old URLs stay as deprecated shims.

The admin range download is now fault tolerant - one unbillable order used to
fail the whole batch.

Remove the commented-out thermal variant of generateInvoice and the unused
paymentOptionIdPaymentOptionMapUsingPaymentOptions. Bump the asset version for
the sale.js change.		  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
34338 563 d 22 h ranu /trunk/ billed order edit customer address  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/update-order-customer-details.js
31738 1300 d 0 h amit.gupta /trunk/profitmandi-fofo/src/main/ Fixed Multi options.  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
31274 1395 d 7 h amit.gupta /trunk/ Removed unwanted files  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/MobileInsurancePlan.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
28055 2035 d 1 h tejbeer /trunk/ change  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/FofoItemIdAmountModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
27861 2054 d 0 h tejbeer /trunk/ change  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/FofoItemIdAmountModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PartnerOptionsAndItemAmountModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/update-order-customer-details.js
27386 2158 d 6 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm
24333 2853 d 6 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fixed nothing  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
24280 2860 d 1 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fixed DOA  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
24279 2860 d 1 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
24278 2860 d 1 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fixed  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
24277 2860 d 1 h amit.gupta /trunk/ Resolved.  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
24276 2860 d 2 h amit.gupta /trunk/ Fixed partner mark  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDailyInvestment.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerDailyInvestmentRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerDailyRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupportController.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TargetSlabRepository.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.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/RechargeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/dashboard.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
24271 2860 d 7 h amit.gupta /trunk/ Added Neeraj  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/customer-return.js
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ScanRecordRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/dashboard.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
24152 2920 d 1 h govind /trunk/ Payment Option Editing  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PaymentOptionTransactionModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
24121 2931 d 2 h govind /trunk/ Target Vs Sale and Update Bill Details  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/monitored/SendMailDailyVsTargetReport.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/monitored/NagiosMonitorTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/NagiosMonitoringScheduledSkeleton.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerTargetController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-target.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/update-order-customer-details.js
24105 2941 d 2 h govind /trunk/ change in Payment details in search Order  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PaymentOptionTransactionModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PaymentOptionTransactionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PaymentOptionTransactionRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
24072 2958 d 7 h amit.gupta /trunk/ Fixed https and attendance issues  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.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/WEB-INF/views/ftl/create-recharge-commission.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-vendor.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-warehouse.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
24056 2962 d 10 h amit.gupta /trunk/ One can add pricing now.  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge-commission.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-vendor.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-warehouse.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.js
24016 2973 d 2 h amit.gupta /trunk/ Fixed attendance  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge-commission.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-vendor.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-warehouse.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

←Prev12Next→

Show All