diff --git a/app/Http/Controllers/Shop/ClientController.php b/app/Http/Controllers/Shop/ClientController.php index 1a52b35e638e..755615a9e5cb 100644 --- a/app/Http/Controllers/Shop/ClientController.php +++ b/app/Http/Controllers/Shop/ClientController.php @@ -15,6 +15,7 @@ use App\Events\Client\ClientWasCreated; use App\Factory\ClientFactory; use App\Http\Controllers\BaseController; use App\Http\Requests\Client\StoreClientRequest; +use App\Http\Requests\Shop\StoreShopClientRequest; use App\Models\Client; use App\Models\ClientContact; use App\Models\Company; @@ -23,12 +24,14 @@ use App\Repositories\ClientRepository; use App\Transformers\ClientTransformer; use App\Utils\Ninja; use App\Utils\Traits\MakesHash; +use App\Utils\Traits\Uploadable; use Illuminate\Http\Request; class ClientController extends BaseController { use MakesHash; - + use Uploadable; + protected $entity_type = Client::class; protected $entity_transformer = ClientTransformer::class; @@ -64,7 +67,7 @@ class ClientController extends BaseController return $this->itemResponse($contact->client); } - public function store(StoreClientRequest $request) + public function store(StoreShopClientRequest $request) { $company = Company::where('company_key', $request->header('X-API-COMPANY-KEY'))->first(); diff --git a/app/Http/Controllers/Shop/InvoiceController.php b/app/Http/Controllers/Shop/InvoiceController.php index 003234f13e7d..3a70c75a7392 100644 --- a/app/Http/Controllers/Shop/InvoiceController.php +++ b/app/Http/Controllers/Shop/InvoiceController.php @@ -15,7 +15,9 @@ use App\Events\Invoice\InvoiceWasCreated; use App\Factory\InvoiceFactory; use App\Http\Controllers\BaseController; use App\Http\Requests\Invoice\StoreInvoiceRequest; +use App\Http\Requests\Shop\StoreShopInvoiceRequest; use App\Models\Client; +use App\Models\Company; use App\Models\CompanyToken; use App\Models\Invoice; use App\Models\InvoiceInvitation; @@ -66,7 +68,7 @@ class InvoiceController extends BaseController } - public function store(StoreInvoiceRequest $request) + public function store(StoreShopInvoiceRequest $request) { $company = Company::where('company_key', $request->header('X-API-COMPANY-KEY'))->first(); @@ -80,7 +82,7 @@ class InvoiceController extends BaseController $client = Client::find($request->input('client_id')); - $invoice = $this->invoice_repo->save($request->all(), InvoiceFactory::create($company_id, $company->owner()->id)); + $invoice = $this->invoice_repo->save($request->all(), InvoiceFactory::create($company->id, $company->owner()->id)); event(new InvoiceWasCreated($invoice, $company, Ninja::eventVars())); diff --git a/app/Http/Requests/Shop/StoreShopClientRequest.php b/app/Http/Requests/Shop/StoreShopClientRequest.php new file mode 100644 index 000000000000..c7ee2497df2f --- /dev/null +++ b/app/Http/Requests/Shop/StoreShopClientRequest.php @@ -0,0 +1,183 @@ +input('documents') && is_array($this->input('documents'))) { + $documents = count($this->input('documents')); + + foreach (range(0, $documents) as $index) { + $rules['documents.' . $index] = 'file|mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000'; + } + } elseif ($this->input('documents')) { + $rules['documents'] = 'file|mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000'; + } + + /* Ensure we have a client name, and that all emails are unique*/ + //$rules['name'] = 'required|min:1'; + $rules['id_number'] = 'unique:clients,id_number,' . $this->id . ',id,company_id,' . $this->company_id; + $rules['settings'] = new ValidClientGroupSettingsRule(); + $rules['contacts.*.email'] = 'nullable|distinct'; + $rules['contacts.*.password'] = [ + 'nullable', + 'sometimes', + 'string', + 'min:7', // must be at least 10 characters in length + 'regex:/[a-z]/', // must contain at least one lowercase letter + 'regex:/[A-Z]/', // must contain at least one uppercase letter + 'regex:/[0-9]/', // must contain at least one digit + //'regex:/[@$!%*#?&.]/', // must contain a special character + ]; + + if($this->company->account->isFreeHostedClient()) + $rules['hosted_clients'] = new CanStoreClientsRule($this->company->id); + + return $rules; + } + + + protected function prepareForValidation() + { + $this->company = Company::where('company_key', request()->header('X-API-COMPANY-KEY'))->firstOrFail(); + + $input = $this->all(); + + //@todo implement feature permissions for > 100 clients + // + $settings = ClientSettings::defaults(); + + if (array_key_exists('settings', $input) && !empty($input['settings'])) { + foreach ($input['settings'] as $key => $value) { + $settings->{$key} = $value; + } + } + + if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) { + $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']); + } + + //is no settings->currency_id is set then lets dive in and find either a group or company currency all the below may be redundant!! + if (!property_exists($settings, 'currency_id') && isset($input['group_settings_id'])) { + $input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']); + $group_settings = GroupSetting::find($input['group_settings_id']); + + if ($group_settings && property_exists($group_settings->settings, 'currency_id') && isset($group_settings->settings->currency_id)) { + $settings->currency_id = (string)$group_settings->settings->currency_id; + } else { + $settings->currency_id = (string)$this->company->settings->currency_id; + } + } elseif (!property_exists($settings, 'currency_id')) { + $settings->currency_id = (string)$this->company->settings->currency_id; + } + + if (isset($input['currency_code'])) { + $settings->currency_id = $this->getCurrencyCode($input['currency_code']); + } + + $input['settings'] = $settings; + + if (isset($input['contacts'])) { + foreach ($input['contacts'] as $key => $contact) { + if (array_key_exists('id', $contact) && is_numeric($contact['id'])) { + unset($input['contacts'][$key]['id']); + } elseif (array_key_exists('id', $contact) && is_string($contact['id'])) { + $input['contacts'][$key]['id'] = $this->decodePrimaryKey($contact['id']); + } + + + //Filter the client contact password - if it is sent with ***** we should ignore it! + if (isset($contact['password'])) { + if (strlen($contact['password']) == 0) { + $input['contacts'][$key]['password'] = ''; + } else { + $contact['password'] = str_replace("*", "", $contact['password']); + + if (strlen($contact['password']) == 0) { + unset($input['contacts'][$key]['password']); + } + } + } + } + } + + if(isset($input['country_code'])) { + $input['country_id'] = $this->getCountryCode($input['country_code']); + } + + if(isset($input['shipping_country_code'])) { + $input['shipping_country_id'] = $this->getCountryCode($input['shipping_country_code']); + } + + $this->replace($input); + } + + public function messages() + { + return [ + 'unique' => ctrans('validation.unique', ['attribute' => 'email']), + //'required' => trans('validation.required', ['attribute' => 'email']), + 'contacts.*.email.required' => ctrans('validation.email', ['attribute' => 'email']), + ]; + } + + private function getCountryCode($country_code) + { + $countries = Cache::get('countries'); + + $country = $countries->filter(function ($item) use($country_code) { + return $item->iso_3166_2 == $country_code || $item->iso_3166_3 == $country_code; + })->first(); + + return (string) $country->id; + } + + private function getCurrencyCode($code) + { + $currencies = Cache::get('currencies'); + + $currency = $currencies->filter(function ($item) use($code){ + return $item->code == $code; + })->first(); + + return (string) $currency->id; + } + +} diff --git a/app/Http/Requests/Shop/StoreShopInvoiceRequest.php b/app/Http/Requests/Shop/StoreShopInvoiceRequest.php new file mode 100644 index 000000000000..4b895a5e63b4 --- /dev/null +++ b/app/Http/Requests/Shop/StoreShopInvoiceRequest.php @@ -0,0 +1,109 @@ +input('documents') && is_array($this->input('documents'))) { + $documents = count($this->input('documents')); + + foreach (range(0, $documents) as $index) { + $rules['documents.' . $index] = 'file|mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000'; + } + } elseif ($this->input('documents')) { + $rules['documents'] = 'file|mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000'; + } + + $rules['client_id'] = 'required|exists:clients,id,company_id,'.$this->company->id; + + $rules['invitations.*.client_contact_id'] = 'distinct'; + + $rules['number'] = new UniqueInvoiceNumberRule($this->all()); + + return $rules; + } + + protected function prepareForValidation() + { + $this->company = Company::where('company_key', request()->header('X-API-COMPANY-KEY'))->firstOrFail(); + + $input = $this->all(); + + if (array_key_exists('design_id', $input) && is_string($input['design_id'])) { + $input['design_id'] = $this->decodePrimaryKey($input['design_id']); + } + + if (array_key_exists('client_id', $input) && is_string($input['client_id'])) { + $input['client_id'] = $this->decodePrimaryKey($input['client_id']); + } + + if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) { + $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']); + } + + if (isset($input['client_contacts'])) { + foreach ($input['client_contacts'] as $key => $contact) { + if (!array_key_exists('send_email', $contact) || !array_key_exists('id', $contact)) { + unset($input['client_contacts'][$key]); + } + } + } + + if (isset($input['invitations'])) { + foreach ($input['invitations'] as $key => $value) { + if (isset($input['invitations'][$key]['id']) && is_numeric($input['invitations'][$key]['id'])) { + unset($input['invitations'][$key]['id']); + } + + if (isset($input['invitations'][$key]['id']) && is_string($input['invitations'][$key]['id'])) { + $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']); + } + + if (is_string($input['invitations'][$key]['client_contact_id'])) { + $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']); + } + } + } + + $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : []; + //$input['line_items'] = json_encode($input['line_items']); + $this->replace($input); + } +}