Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
37823 5 d 10 h amit /trunk/profitmandi-fofo/src/main/ feat(seller): rebuild Sellers & Warehouses screen; PO supplier filter by warehouse; internal warehouse from active sellerwarehouse

Needs dao r37822 and the warehouseaddressmaster.active migration (applied on hadb1).

- Sellers & Warehouses (menu 113): SellerController is now a thin layer over
WarehouseSetupService. Seller list; per-seller physical warehouses with internal
store / supplier / Dummy / sequences, Active toggle and Change address (internal
stores follow); address list with Active toggle; New Address with city, pin,
contact and invoice preview; New Seller with GSTIN checks; New Warehouse creates
the OURS/BAD vendor 40 + Dummy shape. JSON posts; refusals come back as 400 text.
- PO create screen: vendor search takes the selected warehouse and lists only
suppliers mapped to it (/vendors?warehouseId); changing warehouse clears the vendor.
- Supplier create/edit: internal warehouse defaults to 0 and is picked from active
physical warehouses (transaction.sellerwarehouse.is_active), not WAREHOUSE_MAP;
validated on save. Fixes the edit form ticking "Internal Warehouse" for a stored 0
and saving the first option (7720), and the create form never sending it.
- jsVersion 441.
 
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupplierController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-supplier.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/new-supplier.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller-warehouse-container.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-create-purchase-order.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/seller.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse.js
37564 27 d 4 h amit /trunk/profitmandi-fofo/src/main/ Creation screens request only live listings from the item typeahead

/item takes an activeOnly flag (default false, preserving current behaviour)
and passes it to getAllPartnerItemStringDescription. getItemAheadOptions takes
an optional 4th argument, so existing 3-argument callers are unaffected.

Sent true from the two creation entry points:
- warehouse purchase (PO) invoice line picker
- the new-price-drop modal (#typeaheaditem)

Left false where the screen works on records that already exist and may since
have been delisted: the price-drop pause/manage picker (#typeaheaditem1),
catalog-item, combo and prebooking.

jsVersion 419 -> 420 to cache-bust common.js / warehouse-purchase.js (419 was
already taken by another 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/PriceDropController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
37458 38 d 18 h aman /trunk/profitmandi-fofo/src/main/ LOI payment screenshot: report upload failures instead of reporting the field as missing

Submit validated the hidden #payment-sc-docId, but a file input keeps displaying the
chosen filename regardless of what happens next - so a failed /document-upload left the
field looking attached to the operator and missing to the validator ("The following
fields are required: Payment screenshot" on a form that was in fact filled in).

The failure was silent three ways: doAjaxUploadRequestHandler had no error handler; the
global ajaxError reporter calls bootbox, which loads from cdnjs and throws if that is
blocked; and the confirm('Confirm file upload ?') gate returned false with no trace once
Chrome's "prevent this page from creating additional dialogs" box was ticked.

- common.js: optional error callback on doAjaxUploadRequestHandler (additive, opts out of
the generic global dialog via suppressGlobalError); uploadErrorMessage() extracts the
server's real reason from the JSON body or the plain-text duplicate-request body;
uploadDocument() pre-checks size/type, verifies a document_id actually came back, and
reports a message naming the file - .HEIC and .webp get specific guidance;
showAlert() falls back to native alert when bootbox is absent.
- loi-form.js: drop the confirm() gate, 'input' -> 'change', and clear the file input
whenever the id does not land so the widget can never claim an unuploaded file. Status
line under the field (Uploading... / Attached: name / Not attached). Submit now
distinguishes not-picked, still-uploading and upload-failed. Same treatment for the
OnboardingDocumentTable and mk_brand-fee-collection-details uploads, and the brand-fee
dialog names the Attachment field instead of echoing the raw form key.
- loi-form.vm, pendingForm.vm: accept="..." on both file inputs plus the status span.
- FileUploadController: reject empty files, report actual size against the actual limit,
and resolveExtension() falls back to the filename when the browser sends a generic MIME
type (Android file managers send application/octet-stream for ordinary JPG/PNG/PDF).
- AppConfig: static resource version 395 -> 396 for the 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/FileUploadController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loi-form.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pendingForm.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/loi-form.js
37282 57 d 14 h amit /trunk/profitmandi-fofo/src/main/ hot deals: remove legacy tag_listing hot-deals endpoints and catalog-item UI (replaced by model_hot_deal admin flow)  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-item.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
37194 67 d 13 h aman /trunk/ LOI OTP: report real send outcome instead of always 'OTP Sent Successfully!'

The Send OTP button showed success for any HTTP 200, including the daily-cap
failure where the controller returned 'Something went wrong..'. Ops could not
tell a working send from a broken one, so genuine failures were invisible.

- OTPResponse: add 'sent' flag. result=true did not mean anything was
dispatched - the 2-minute resend throttle returns the previous OTP without
contacting the gateway.
- OtpProcessor: set sent=true only on branches that actually dispatch.
- LoiFormController.sentLoiAcceptanceOtp: return {status, sent, message} with
the processor's real reason, wrap generateOtp in try/catch so a dispatch
exception is logged and reported instead of surfacing as a generic 500, and
log loiId/result/sent/reason.
- loi-form.js: check the payload; distinct green/amber/red states, re-enable
the button on failure instead of leaving it stuck on 'Sending...'.
- common.js: optional error callback on doAjaxRequestHandler /
doPostAjaxRequestHandler (additive; existing callers unchanged).
- AppConfig: static resource version 389 -> 390 for the JS change.
 
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/OTPResponse.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/OtpProcessor.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/LoiFormController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/loi-form.js
37171 68 d 19 h amit /trunk/profitmandi-fofo/src/main/ Wallet page: show sanctioned credit limit tile alongside utilization/total due; format amounts via currency class + formatCurrency on load; jsVersion 388  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-history-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
36922 104 d 13 h amit /trunk/profitmandi-fofo/src/main/ Remove unused Digify retailer integration and fix slim-jQuery clobber on partner-performance/today_po/today_target pages

- Delete Digify controller, views and Buyback asset; drop dead .digify-retailer-login handler and buyback links/buttons
- Load full jQuery (3.5.1) instead of jquery slim on partner-performance/today_po/today_target so injected pages no longer overwrite the dashboard jQuery (restores $.ajax / slideUp)
- Bump jsVersion to 365
 
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/digify
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/digify-retailer-login.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/digify-retailer-register.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/images/Buyback-Mobile.png
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-role.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_target.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
36819 118 d 16 h amit /trunk/profitmandi-fofo/src/main/ Fix idempotency dedup to be server-authoritative (content + partner scoped)

PostInterceptor now keys duplicates on sha256(fofoId|method|uri|bodyHash) for
mutating methods only, instead of the client-supplied IdempotencyKey header.
The header was rotated per-request by the frontend (and old/sticky clients),
so identical submissions produced distinct keys and were never deduped - e.g.
a create-offer burst created 147 duplicate rows. Keying on the request body
makes dedup independent of client behaviour; partner scoping prevents cross-
partner collisions; distinct payloads (one-offer-per-partner) are unaffected.
GET/HEAD are now never deduped (removes spurious GET 400s).

common.js: attach IdempotencyKey only to mutating methods; stop rotating the
key on every ajaxComplete (kept reset on ajaxSuccess only). version 355.
 
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/PostInterceptor.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
36697 133 d 12 h amit /trunk/profitmandi-fofo/src/main/ fix: FY date range end date missing endOf day in account statement picker, bump version to 342  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
36598 140 d 15 h amit /trunk/profitmandi-fofo/src/main/ Flagship models: catalog-level typeahead with 70K min price filter, add menu_category access  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/flagship.js
36572 143 d 16 h amit /trunk/ fix: add debit note PDF labels, HDFC UTR duplicate lock, AJAX error handlers in common.js  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
35626 249 d 13 h amit /trunk/ Ticket system: add unread tracking, pagination, search, and partner notifications  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketReadStatus.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketReadStatusRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketReadStatusRepositoryImpl.java
/trunk/profitmandi-dao/src/main/resources/partner-ticket-update.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket-content.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/my-partner-tickets-content.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-content.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ticket-manager.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ticket-renderer.js
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-paginated.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TicketViewModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/my-partner-tickets.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java
35594 252 d 10 h amit /trunk/ Ticket system: CRM access, category filtering, UI improvements

CRM Team Access:
- CRM users can see all tickets in myticket and managerTicket views
- CRM users can assign/edit tickets from all views
- Only CRM can mark tickets as resolved

Category Filtering (hidden from CRM):
- Sales category (ID 4) and Sales Escalation subcategory (ID 84)
- RBM category (ID 18) and RBM Escalation subcategory (ID 83)

UI Improvements:
- Partner name link opens partnerPerformance in new tab (reusable via .partner-link class)
- Edit modal shows ticket ID and partner name in title
- Resolve confirm shows ticket ID and partner name
- Fixed duplicate class attributes in buttons
- Modal shows after content loads (removed data-toggle conflicts)

Version bump: JS 313, CSS 34
 
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.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/CsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-ticket-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-ticket-partner-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/my-partner-tickets.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
35544 269 d 14 h amit /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Handle scientific notation (e.g., 1.37E7) in numberToComma() function  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
35533 272 d 18 h amit /trunk/profitmandi-fofo/src/main/ Fixed AppConfig  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
35510 279 d 15 h amit /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fixed method Number to comma for Cr. Values  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
35459 290 d 11 h amit /trunk/ Revert non-Java file changes from r35458  
/trunk/profitmandi-dao/build.gradle
/trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
/trunk/profitmandi-fofo/src/main/resources/log4j2.xml
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
/trunk/profitmandi-web/src/main/resources/META-INF/env.property
/trunk/profitmandi-web/src/main/resources/log4j2.xml
35458 290 d 11 h amit /trunk/ Revert @Transactional(readOnly=true) - keep @Transactional only at Controller level

Changes:
- profitmandi-web: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional(readOnly = true)
- profitmandi-fofo: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional
- profitmandi-dao: Removed @Transactional from services/repositories

Exceptions (called from interceptors, need own transaction):
- RoleManager: @Transactional(readOnly = true) - called from interceptor for auth
- PartnerTypeChangeServiceImpl.getBestPartner(): @Transactional - called from JWTUtil via interceptor

Fixed javax.transaction.Transactional to org.springframework.transaction.annotation.Transactional
Fixed rollbackOn to rollbackFor for Spring compatibility
 
/trunk/profitmandi-dao/pinelabs.http
/trunk/profitmandi-dao
/trunk/profitmandi-dao/build.gradle
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.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/fofo/PartnerTypeChangeServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsCustomerRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsOrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsPaymentMethodRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsRefundRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/PurSaleServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/SaleRewardServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ScratchService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication/RoleManager.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/SchemeBlockedImeiServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AccessManagementController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CustomerController.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/FofoController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InvoiceController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemLedgerController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.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/LogisticsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MapTrackController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MarginController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MongoMigrationController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerPendingTasksController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerTargetController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PaymentOptionController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PunchInOutController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebListingController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebOffersController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/logix/LogixController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/provider/ProviderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/purchase_sale_ratio/PurSaleController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse_rider/WarehouseRiderController.java
/trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
/trunk/profitmandi-fofo/src/main/resources/log4j2.xml
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BannerListingController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.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/CustomerController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.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/GatewayController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PageController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SmartCartController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SolrSearchController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrackingController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrialUserController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/guest/GuestController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/scratch/ScratchController.java
/trunk/profitmandi-web/src/main/resources/META-INF/env.property
/trunk/profitmandi-web/src/main/resources/log4j2.xml
35289 325 d 21 h amit /trunk/ Added trial franchisee feature  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TrialForm.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialFormRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialFormRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/trial-form.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/trial-form.js
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/trialUser
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialOnboardingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialOnboardingRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.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/RetailerController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
34859 426 d 13 h vikas /trunk/ Web Pages Management  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Page.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/page
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/page/PageModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/page/PageRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/page/PageRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PagesController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pages
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pages/index.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/pages.js
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Show All