Fix minor issues

This commit is contained in:
harshjagad20
2022-03-14 11:54:13 +05:30
parent 18507ddb6f
commit e7301eb7a3
5 changed files with 77 additions and 69 deletions

View File

@@ -3,7 +3,6 @@
namespace Crater\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Str;
use Illuminate\Validation\Rule;
class CompaniesRequest extends FormRequest
@@ -34,6 +33,9 @@ class CompaniesRequest extends FormRequest
'currency' => [
'required'
],
'currency' => [
'required'
],
'address.name' => [
'nullable',
],
@@ -71,8 +73,7 @@ class CompaniesRequest extends FormRequest
'name'
])
->merge([
'owner_id' => $this->user()->id,
'slug' => Str::slug($this->name)
'owner_id' => $this->user()->id
])
->toArray();
}

View File

@@ -217,7 +217,7 @@ class Company extends Model implements HasMedia
'estimate_billing_address_format' => $billingAddressFormat,
'payment_company_address_format' => $companyAddressFormat,
'payment_from_customer_address_format' => $paymentFromCustomerAddress,
'currency' => request()->currency ?? 13,
'currency' => request()->currency ?? 1,
'time_zone' => 'Asia/Kolkata',
'language' => 'en',
'fiscal_year' => '1-12',