diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index efcdb99c..6676fc0b 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -17,7 +17,7 @@ class TransactionResource extends JsonResource public function toArray($request) { $booking = (int)$this->type === TransactionType::BILL ? $this->owner->owner : $this->booking; - $days = Carbon::parse($this->created_at)->addDays($booking->service_id === 1 ? 1 : 2); + $days = Carbon::parse($this->created_at->format('d-m-Y'))->addDays($booking->service_id === 1 ? 2 : 3); return [ 'id' => $this->id, diff --git a/resources/assets/vue/components/wallets/elements/WalletComponent.vue b/resources/assets/vue/components/wallets/elements/WalletComponent.vue index 486f821d..44e744d2 100644 --- a/resources/assets/vue/components/wallets/elements/WalletComponent.vue +++ b/resources/assets/vue/components/wallets/elements/WalletComponent.vue @@ -10,7 +10,7 @@
-
Congratulation! You've earned and achievement
+
Congratulation! You've earned an achievement
diff --git a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue index 23f56c46..7e2cfd47 100644 --- a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue +++ b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue @@ -119,7 +119,7 @@ parameters: { amount: { required, - minValue: minValue(this.minValue), + minValue: 0, }, reference: { required: requiredIf(function () { return this.parameters.transaction_type !== 0 })