From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/NewRentalApply.page | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/pages/NewRentalApply.page b/force-app/main/default/pages/NewRentalApply.page
index df81066..ffc0be6 100644
--- a/force-app/main/default/pages/NewRentalApply.page
+++ b/force-app/main/default/pages/NewRentalApply.page
@@ -13,6 +13,12 @@
<script>
//Initial Required Information
var staticResources = JSON.parse('{!staticResource}');
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ var staticResourcesV2 = JSON.parse('{!staticResourceV2}');
+ var isEdit = JSON.parse('{!isEdit}');
+ var phoneNumber = '';
+ var directShippmentAddress = '';
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
var staticResourcesContact = JSON.parse('{!staticResourceContact}');
var requiredFieldAPIList = JSON.parse('{!requiredFieldAPIListStr}');
var fieldAPIToLabelMap = JSON.parse('{!fieldAPIToLabelMapStr}');
@@ -39,8 +45,19 @@
//Query Required Parameter
var queryBack = function queryBack(data) {
console.log('data = ' + data);
- document.querySelector("[data-id='Phone_number__c']").value = data.object.phoneNumber;
- document.querySelector("[data-id='direct_shippment_address__c']").value = data.object.directShippmentAddress;
+ // document.querySelector("[data-id='Phone_number__c']").value = data.object.phoneNumber;
+ // document.querySelector("[data-id='direct_shippment_address__c']").value = data.object.directShippmentAddress;
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ if(document.querySelector("[data-id='Phone_number__c']")){
+ document.querySelector("[data-id='Phone_number__c']").value = data.object.phoneNumber;
+ phoneNumber = data.object.phoneNumber == null ? '': data.object.phoneNumber;
+ }
+
+ if(document.querySelector("[data-id='direct_shippment_address__c']")){
+ document.querySelector("[data-id='direct_shippment_address__c']").value = data.object.directShippmentAddress;
+ directShippmentAddress = data.object.directShippmentAddress == null ? '' : data.object.directShippmentAddress;
+ }
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
unblockUI();
enableButtonStatus();//Add by Li Jun 20220418
};
@@ -54,8 +71,10 @@
console.log('payloadJson=' + JSON.stringify(payloadJson));
payloadJson.Phone_number__c = r.object[0].phoneNumber;
payloadJson.direct_shippment_address__c = r.object[0].directShippmentAddress;
- payloadJson.Phone_Number_Encrypt__c = r.object[0].phoneNumberEncrypt;
- payloadJson.Direct_Shippment_Address_Encrypt__c = r.object[0].directShippmentAddressEncrypt;
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ // payloadJson.Phone_Number_Encrypt__c = r.object[0].phoneNumberEncrypt;
+ // payloadJson.Direct_Shippment_Address_Encrypt__c = r.object[0].directShippmentAddressEncrypt;
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if('{!rtTypeId}'){
payloadJson.RecordTypeId = '{!rtTypeId}';//Add by Li Jun for Record Type Issue 20220419
@@ -273,13 +292,21 @@
let obj = JSON.parse(payloadForNewPI);
obj[0].dataId = '{!AWSDataId}';
let payloadForNewPIJson = JSON.stringify(obj);
- AWSService.update(staticResources.updateUrl, rentalApplyJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ //AWSService.update(staticResources.updateUrl, rentalApplyJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
+ AWSService.update(staticResourcesV2.updateUrl, rentalApplyJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResourcesV2.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
}
//Insert Sensitive Information to AWS
function NewPIToAWS(rentalApplyJson, payloadForNewPI) {
let controllerSaveMethod = '{!$RemoteAction.RentalApplyController.saveRentalApply}';
- AWSService.insert(staticResources.newUrl, rentalApplyJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ //AWSService.insert(staticResources.newUrl, rentalApplyJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack, redirectCallBack);
+ debugger
+ console.log('staticResourcesV2.newUrl = ' + staticResourcesV2.newUrl);
+ AWSService.insert(staticResourcesV2.newUrl, rentalApplyJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResourcesV2.transactionUrl, true, insertOrUpdateBack, redirectCallBack);
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
}
//Check Required Fields
@@ -326,6 +353,14 @@
}
//3. Prepare the payload for New PI API To AWS - To Do
let payloadForNewPI = getPIPayload(rentalApplyJson);
+
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ debugger
+ if(isEdit == true && (rentalApplyJson.Phone_number__c != phoneNumber || rentalApplyJson.direct_shippment_address__c != directShippmentAddress)){
+ alertErrorMessage('鐢宠鍗曟壒鍑嗗悗锛屼笉鑳界紪杈戝鍝佸�熺敤淇℃伅');
+ return
+ }
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
//4. rentalApply to AWS
ProcessPI(rentalApplyJson, payloadForNewPI);
@@ -480,6 +515,7 @@
</apex:pageBlockSection>
</apex:repeat>
<script>
+ blockme(); //zhj 2022-12-28 improve
var init_nodes = document.getElementsByClassName("PIBackApi");
var api_id_map={};
for(let ei in init_nodes){
@@ -537,7 +573,6 @@
//2. Query AWS Data by dataId
console.log('Mode for rentalApply Page:' + {!isNewMode});
if (!{!isNewMode}) {
- blockme();
QueryRentalApplyFromAWS();
}else{
enableButtonStatus();//Add by Li Jun 20220418
@@ -566,6 +601,8 @@
}
})
});
+
+ unblockUI();
--
Gitblit v1.9.1