diff --git a/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php b/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php index b705d75c..c1295886 100644 --- a/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php +++ b/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php @@ -24,6 +24,9 @@ class BillplzXSignatureObject implements DataTransferObject /** @var string */ private $billPlzComputedXSignature; + /** @var string */ + private $type; + /** @var Request */ private $request; @@ -33,7 +36,9 @@ class BillplzXSignatureObject implements DataTransferObject public function __construct(Request $request) { - $this->request = $request->exists('billplz') ? $request->input('billplz') : $request; + $this->type = $request->exists('billplz') ? 'redirect' : 'callback'; + + $this->request = $this->type === 'redirect' ? $request->input('billplz') : $request; $this->billPlzId = $this->request['id']; @@ -47,7 +52,7 @@ class BillplzXSignatureObject implements DataTransferObject private function _constructBillplzArray(){ $this->billPlzConstructArray = collect($this->request)->forget('x_signature')->map(function($item, $key){ - return $this->request->exists('billplz') ? 'billplz'.$key.$item : $key.$item; + return $this->type === 'redirect' ? 'billplz'.$key.$item : $key.$item; })->toArray(); return $this;