Merge remote-tracking branch 'origin/feature-201846-wangcz' into feature-201846-wangcz

src/main/webapp/resources/js/vendor/controllers/forstore/seek_purchase_ctrl.js

@@ -433,7 +433,8 @@ define(['app/app'], function (app) {
 
 
           $scope.onLeadtimeInput = function () {
-            var time = $scope.inquiryItem.leadtime.toString();
+            $scope.inquiryItem.leadtime= $scope.inquiryItem.leadtime.replace(/[^\d]*/g, '');
+            var time = $scope.inquiryItem.leadtime;
             if (time.length > 3) {
               $scope.inquiryItem.leadtime = Number(time.substring(0, 3));
             }
@@ -450,7 +451,8 @@ define(['app/app'], function (app) {
           };
 
           $scope.onTaxrateInput = function () {
-              var time = $scope.inquiryItem.taxrate.replace(/[^\-?\d.]/g, '');
+              $scope.inquiryItem.taxrate = $scope.inquiryItem.taxrate.replace(/[^\d]*/g, '');
+              var time = $scope.inquiryItem.taxrate;
               if (time.length > 2) {
                   $scope.inquiryItem.taxrate = Number(time.substring(0, 2));
               }
@@ -511,6 +513,7 @@ define(['app/app'], function (app) {
             }
           }
           $scope.onReplyLapQtyInput = function (index) {
+              $scope.inquiryItem.replies[index].lapQty = $scope.inquiryItem.replies[index].lapQty.replace(/[^\d]*/g, '')
             var lapQty =  $scope.inquiryItem.replies[index].lapQty.toString();
             if (lapQty.length >= 10) {
               $scope.inquiryItem.replies[index].lapQty = Number(lapQty.substring(0, 9));
@@ -530,6 +533,7 @@ define(['app/app'], function (app) {
           }
 
           $scope.onReplyPriceInput = function (index) {
+              $scope.inquiryItem.replies[index].price = $scope.inquiryItem.replies[index].price.replace(/[^\d.]*/g, '')
             var price = $scope.inquiryItem.replies[index].price.toString();
             if (price >= 10000) {
               $scope.inquiryItem.replies[index].price = Number(price.substring(0, 4));

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_store_apply_ctrl.js

@@ -70,6 +70,9 @@ define(['app/app', 'jquery-uploadify'], function (app) {
 							if (result.qualifications) {
 								angular.forEach(result.qualifications, function (qualification) {
 									$scope.qualifications[qualification.type] = qualification;
+									if (isPdf(qualification.resourceUrl)) {
+                                        $scope.qualifications[qualification.type].isPdf = true
+									}
 								});
 							}else {
 								Enterprise.getEnterpriseDetailInfo({ enuu : enterprise.uu},{},function (enterpriseDetail) {