diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php index 2ee72347d74b..4c3b01bf6f5d 100644 --- a/app/DataMapper/CompanySettings.php +++ b/app/DataMapper/CompanySettings.php @@ -72,7 +72,7 @@ class CompanySettings extends BaseSettings public $translations; - public $counter_number_applied = 'when_saved';// when_saved , when_sent , when_paid + public $counter_number_applied = 'when_saved';// when_saved , when_sent public $quote_number_applied = 'when_saved';// when_saved , when_sent /* Counters */ diff --git a/app/Http/Requests/Payment/UpdatePaymentRequest.php b/app/Http/Requests/Payment/UpdatePaymentRequest.php index a9e458011524..801c55654a32 100644 --- a/app/Http/Requests/Payment/UpdatePaymentRequest.php +++ b/app/Http/Requests/Payment/UpdatePaymentRequest.php @@ -40,7 +40,7 @@ class UpdatePaymentRequest extends Request 'invoices' => ['array',new PaymentAppliedValidAmount,new ValidCreditsPresentRule], 'invoices.*.invoice_id' => 'distinct', 'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx', - 'number' = 'nullable|unique:payments,number,' . $this->id . ',id,company_id,' . $this->company_id, + 'number' => 'nullable|unique:payments,number,' . $this->id . ',id,company_id,' . $this->company_id, ]; if ($this->input('documents') && is_array($this->input('documents'))) { diff --git a/app/Transformers/ClientGatewayTokenTransformer.php b/app/Transformers/ClientGatewayTokenTransformer.php index 116e31c4ffed..69a22bd69220 100644 --- a/app/Transformers/ClientGatewayTokenTransformer.php +++ b/app/Transformers/ClientGatewayTokenTransformer.php @@ -36,6 +36,7 @@ class ClientGatewayTokenTransformer extends EntityTransformer 'gateway_type_id' => (string)$cgt->gateway_type_id ?: '', 'company_gateway_id' => (string)$this->encodePrimaryKey($cgt->company_gateway_id) ?: '', 'is_default' => (bool) $cgt->is_default, + 'meta' => $cgt->meta, 'created_at' => (int)$cgt->created_at, 'updated_at' => (int)$cgt->updated_at, 'archived_at' => (int)$cgt->deleted_at,