mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-26 16:04:05 +00:00
Merge branch 'dillon/90-e-invoice-f-3' into vapor/development
This commit is contained in:
@@ -120,7 +120,7 @@ class ImportExcelLogic extends AbstractControllerLogic
|
||||
$result = [
|
||||
'message' => empty($result)
|
||||
? ''
|
||||
: 'Some payments are unprocessed: ',
|
||||
: 'Some data are unprocessed: ',
|
||||
'data' => $result
|
||||
];
|
||||
}
|
||||
@@ -220,15 +220,19 @@ class ImportExcelLogic extends AbstractControllerLogic
|
||||
if($knockOffDocNo)
|
||||
{
|
||||
$kvp = KeyValuePair::where('key', KVPKey::AUTOCOUNT_DOCNO)->where('value', $knockOffDocNo)->first();
|
||||
Log::info('key: ' . json_encode($kvp));
|
||||
$booking = $kvp->owner;
|
||||
if($booking){
|
||||
if($docNo != "" && $docNo != "<<New>>"){
|
||||
$this->updateOrCreateKeyValuePair($booking, KVPKey::AUTOCOUNT_OFFICIAL_RECEIPT_DOCNO, $docNo);
|
||||
if($kvp){
|
||||
$booking = $kvp->owner;
|
||||
if($booking){
|
||||
if($docNo != "" && $docNo != "<<New>>"){
|
||||
$this->updateOrCreateKeyValuePair($booking, KVPKey::AUTOCOUNT_OFFICIAL_RECEIPT_DOCNO, $docNo);
|
||||
}
|
||||
// if($eInvoiceValidationLink){
|
||||
// $this->updateOrCreateKeyValuePair($booking, KVPKey::AUTOCOUNT_EINVOICE_VALIDATION_LINK, $eInvoiceValidationLink);
|
||||
// }
|
||||
}
|
||||
else{
|
||||
$unprocessedKnockOffs[] = $knockOffDocNo;
|
||||
}
|
||||
// if($eInvoiceValidationLink){
|
||||
// $this->updateOrCreateKeyValuePair($booking, KVPKey::AUTOCOUNT_EINVOICE_VALIDATION_LINK, $eInvoiceValidationLink);
|
||||
// }
|
||||
}
|
||||
else{
|
||||
$unprocessedKnockOffs[] = $knockOffDocNo;
|
||||
|
||||
Reference in New Issue
Block a user