WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/webapp/resources/js/loi-form.js

     if (!brandFeesCollected) missingFields.push('Brand Fees Collected');
     if (brandFeesCollected > brandFee) missingFields.push('The collected brand fee must not exceed the agreed brand fees.');
     if (!paymentMode) missingFields.push('Payment Mode');
     if (!paymentReferenceNo) missingFields.push('Payment Reference No');
     if (!feeCollectingDate) missingFields.push('Fee Collecting Date');
+    if (!paymentAttachment) {
+        var screenshotInput = $('#payment-sc-doc')[0];
+        if (paymentScreenshotUploading) {
+            missingFields.push('Payment screenshot (still uploading - wait for "Attached: ..." under the field)');
+        } else if (screenshotInput && screenshotInput.files && screenshotInput.files.length > 0) {
+            missingFields.push('Payment screenshot (the file was picked but the upload did not complete - select it again)');
+        } else {
-    if (!paymentAttachment) missingFields.push('Payment screenshot ');
+            missingFields.push('Payment screenshot');
+        }
+    }
     if (missingFields.length > 0) {
         alert('The following fields are required: ' + missingFields.join(', '));
         return;
+    }
     const loiFormData = {
 $(document).on('click', "#addBrandFeePayment", function () {
     var $btn = $(this);
     if ($btn.prop('disabled')) return false;
     let formData = objectifyForm($("form[name='brandFeeCollectionForm']").serializeArray());
     let loiId = $btn.val();
+    // paymentAttachment is a hidden field filled by the screenshot upload, so name it
+    // the way the operator sees it rather than echoing the raw form key.
+    const brandFeeFieldLabels = {
+        collectedAmount: 'Amount',
+        paymentMode: 'Payment Mode',
+        paymentReferenceNo: 'Reference No',
+        paymentAttachment: 'Attachment (pick the screenshot again - the upload did not complete)',
+        feeCollectingTimeStamp: 'Collecting Date'
+    };
     for (var key in formData) {
         if (formData.hasOwnProperty(key) && formData[key].trim() === '') {
-            alert("The (" + key + ") value is blank please fill this field !");
+            alert("The (" + (brandFeeFieldLabels[key] || key) + ") value is blank please fill this field !");
             return false;
+        }
+    }
     let jsonData = JSON.stringify(formData);
     if (confirm("Are you sure to add payment ?")) {
     doGetAjaxRequestHandler(`${context}/uploadDocumentForm?loiId=${loiId}`,
         function (response) {
             $('#' + 'main-content').html(response);
         });
 });
+// A file input keeps showing the chosen filename no matter what happens next, so the
+// operator reads "attached" from the widget while the validator reads the hidden
-$(document).on('input', 'table#OnboardingDocumentTable input[type=file],table#mk_brand-fee-collection-details input[type=file]', function () {
+// documentId that the upload was supposed to fill. Every path below keeps those two in
+// step: if the id does not land, the file input is cleared so the form stops claiming a
-    if (confirm('Confirm file upload ?')) {
+// file is attached. (The old confirm() gate is gone - picking a file in the OS dialog is
+// already an explicit action, and Chrome's "prevent additional dialogs" checkbox made
-        var fileSelector = $(this)[0];
+// confirm() silently return false, which skipped the upload with no trace.)
-        if (fileSelector != undefined
+var paymentScreenshotUploading = false;
-            && fileSelector.files[0] != undefined) {
+function setPaymentScreenshotStatus(text, cssClass) {
+    $('#payment-sc-status').text(text).attr('class', 'help-block ' + (cssClass || ''));
+}
+$(document).on('change', 'table#OnboardingDocumentTable input[type=file],table#mk_brand-fee-collection-details input[type=file]', function () {
-            var file = this.files[0];
+    var input = this;
-            let fileInput = $(this);
+    var fileInput = $(input);
-            uploadDocument(file, function (documentId) {
+    var file = input.files && input.files[0];
-                fileInput.closest('td').find(".documentId").val(documentId);
+    fileInput.closest('td').find(".documentId").val('');
-            });
+    if (!file) {
-        }
+        return;
+    }
+    uploadDocument(file, function (documentId) {
+        fileInput.closest('td').find(".documentId").val(documentId);
+    }, function (message) {
+        input.value = '';
+        alert(message);
+    });
 });
-$(document).on('input', '#payment-sc-doc', function () {
+$(document).on('change', '#payment-sc-doc', function () {
-    if (confirm('Confirm file upload ?')) {
+    var input = this;
-        var file = this.files[0];
+    var file = input.files && input.files[0];
-        uploadDocument(file, function (documentId) {
+    // A fresh pick invalidates whatever was uploaded before it.
-            $('#payment-sc-docId').val(documentId);
+    $('#payment-sc-docId').val('');
+    if (!file) {
+        paymentScreenshotUploading = false;
+        setPaymentScreenshotStatus('', '');
-        });
+        return;
+    }
+    paymentScreenshotUploading = true;
+    setPaymentScreenshotStatus('Uploading ' + file.name + ' ...', '');
+    uploadDocument(file, function (documentId) {
+        paymentScreenshotUploading = false;
+        $('#payment-sc-docId').val(documentId);
+        setPaymentScreenshotStatus('Attached: ' + file.name, 'text-success');
+    }, function (message) {
+        paymentScreenshotUploading = false;
+        input.value = '';
+        setPaymentScreenshotStatus('Not attached - please select the file again', 'text-danger');
+        alert(message);
+    });
 });
 $(document).on('click', ".mk_docApproval", function () {
     let loiId = $(this).data('form_id');

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/webapp/resources/js/loi-form.js – Rev 37194 → 37458