- favicon fix

- checkout fix
- stripe prefered locales
- color theme
- stripe card info box in dev version

app/Http/Controllers/Oasis/AdminController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Oasis;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\CreateUserByAdmin;
+use App\Http\Requests\Oasis\CreateOrderRequest;
 use App\Http\Resources\UserResource;
 use App\Models\User;
 use App\Models\UserSettings;
@@ -43,10 +44,10 @@ class AdminController extends Controller
     /**
      * Register new client and send email with payment details
      *
-     * @param Request $request
+     * @param CreateOrderRequest $request
      * @return Application|ResponseFactory|Response
      */
-    public function create_order(Request $request)
+    public function create_order(CreateOrderRequest $request)
     {
         // Create user
         $newbie = User::create([
@@ -61,14 +62,14 @@ class AdminController extends Controller
             ->settings()
             ->create([
                 'storage_capacity' => 0,
-                'ico'              => $request->ico,
+                'ico'              => $request->ico ?? null,
                 'name'             => $request->name,
                 'address'          => $request->address,
                 'state'            => $request->state,
                 'city'             => $request->city,
                 'postal_code'      => $request->postal_code,
                 'country'          => $request->country,
-                'phone_number'     => $request->phone_number,
+                'phone_number'     => $request->phone_number ?? null,
                 'timezone'         => '1.0',
             ]);
 

app/Http/Requests/Oasis/CreateOrderRequest.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Requests\Oasis;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CreateOrderRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'ico'          => 'sometimes|nullable',
+            'name'         => 'required|string',
+            'email'        => 'required|email|unique:users',
+            'phone_number' => 'string|nullable',
+            'address'      => 'required|string',
+            'state'        => 'required|string',
+            'city'         => 'required|string',
+            'postal_code'  => 'required|string',
+            'country'      => 'required|string',
+            'plan'         => 'required|string',
+        ];
+    }
+}

app/Http/Resources/Oasis/SubscriptionRequestResource.php

@@ -40,6 +40,7 @@ class SubscriptionRequestResource extends JsonResource
                                 'postal_code'  => $this->user->settings->postal_code,
                                 'country'      => $this->user->settings->country,
                                 'phone_number' => $this->user->settings->phone_number,
+                                'ico'          => $this->user->settings->ico,
                             ]
                         ]
                     ],

app/Http/helpers.php

@@ -588,7 +588,7 @@ function get_image_meta_data($file)
  */
 function is_dev()
 {
-    return env('APP_ENV') === 'local' ? true : false;
+    return env('APP_ENV') === 'local' ? 1 : 0;
 }
 
 /**