diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php index dbafc47..3225ed1 100644 --- a/app/Http/Controllers/ContactController.php +++ b/app/Http/Controllers/ContactController.php @@ -5,13 +5,15 @@ namespace App\Http\Controllers; use App\Http\Requests\ContactRequest; use App\Models\Contact; use App\Models\Customer; +use Illuminate\Contracts\View\View; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; class ContactController extends Controller { - public function index() {} + public function index(): void {} - public function create(Request $request) + public function create(Request $request): View { return view('contacts.create', [ 'customers' => Customer::all(), @@ -19,20 +21,20 @@ class ContactController extends Controller ]); } - public function store(ContactRequest $request) + public function store(ContactRequest $request): RedirectResponse { $contact = Contact::create($request->validated()); return redirect()->route('customers.show', [$contact->customer, 'contacts'])->with('status', 'Contact created successfully'); } - public function show($id) {} + public function show(int $id): void {} - public function edit($id) {} + public function edit(int $id): void {} - public function update(Request $request, $id) {} + public function update(Request $request, int $id): void {} - public function requestDestroy(Request $request) + public function requestDestroy(Request $request): RedirectResponse { $contact = Contact::find($request->get('contact')); $contact->delete(); @@ -40,5 +42,5 @@ class ContactController extends Controller return redirect()->route('customers.show', [$contact->customer->id, 'contacts'])->with('status', 'Contact deleted successfully'); } - public function destroy($id) {} + public function destroy(int $id): void {} } diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 13ebe99..7a8920f 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -5,12 +5,16 @@ namespace App\Http\Controllers; use App\Http\Requests\CustomerRequest; use App\Models\Customer; use App\Models\PackingSlip; +use Illuminate\Contracts\View\Factory; +use Illuminate\Contracts\View\View; +use Illuminate\Foundation\Application; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Carbon; class CustomerController extends Controller { - public function index() {} + public function index(): void {} public function store(CustomerRequest $request) { @@ -19,12 +23,12 @@ class CustomerController extends Controller return redirect()->route('management.index')->with('status', 'Customer created successfully.'); } - public function create() + public function create(): Factory|View|Application|\Illuminate\View\View { return view('customers.create'); } - public function show(Customer $customer, ?string $tab = null) + public function show(Customer $customer, ?string $tab = null): RedirectResponse|View { if (! $tab) { return redirect()->route('customers.show', [$customer, 'tab' => 'details']); @@ -40,14 +44,14 @@ class CustomerController extends Controller ]); } - public function update(CustomerRequest $request, Customer $customer) + public function update(CustomerRequest $request, Customer $customer): RedirectResponse { $customer->update($request->validated()); return redirect()->route('customers.show', $customer)->with('status', 'Customer updated successfully.'); } - public function requestDestroy(Request $request) + public function requestDestroy(Request $request): RedirectResponse { $customer = Customer::find($request->id); $customer->delete(); @@ -55,7 +59,7 @@ class CustomerController extends Controller return redirect()->route('management.index')->with('status', 'Customer deleted successfully.'); } - public function destroy(Customer $customer) + public function destroy(Customer $customer): RedirectResponse { $customer->delete(); diff --git a/app/Http/Controllers/ManagementController.php b/app/Http/Controllers/ManagementController.php index 1fa53eb..b946230 100644 --- a/app/Http/Controllers/ManagementController.php +++ b/app/Http/Controllers/ManagementController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Models\Customer; +use App\Models\ServiceFile; class ManagementController extends Controller { @@ -15,8 +16,9 @@ class ManagementController extends Controller } return view('management.index', [ - 'customers' => Customer::all(), - 'tab' => $tab, + 'customers' => Customer::all(), + 'serviceFiles' => ServiceFile::paginate(15), + 'tab' => $tab, ]); } } diff --git a/app/Http/Controllers/OrderController.php b/app/Http/Controllers/OrderController.php index 2aebeba..419a896 100644 --- a/app/Http/Controllers/OrderController.php +++ b/app/Http/Controllers/OrderController.php @@ -11,8 +11,11 @@ use App\Models\OrderProduct; use App\Models\ProductService; use App\Models\ProductSize; use App\Models\ServiceFile; +use Illuminate\Contracts\View\Factory; +use Illuminate\Foundation\Application; use Illuminate\Http\Request; use Illuminate\Support\Carbon; +use Illuminate\View\View; class OrderController extends Controller { @@ -80,30 +83,28 @@ class OrderController extends Controller // Create productServices for ($i = 0; $i < count($request->get('serviceInputCount')) - 1; $i++) { - $productService = ProductService::create([ - 'order_id' => $order->id, - 'service_type' => $request->get('service_type')[$i], - 'placement' => $request->get('placement')[$i], - 'setup_amount' => $request->get('setup_amount')[$i], - 'amount' => $request->get('amount')[$i], - 'amount_price' => $request->get('amount_price')[$i], + $serviceFile = ServiceFile::create([ + 'code' => $request->get('service_file_name')[$i], + 'name' => $request->get('logo_name')[$i], + 'width' => $request->get('service_width')[$i], + 'height' => $request->get('service_height')[$i], + 'setup_number' => $request->get('setup_amount')[$i], ]); - - ServiceFile::create([ - 'product_service_id' => $productService, - 'code' => $request->get('service_file_name')[$i], - 'name' => $request->get('logo_name')[$i], - 'width' => $request->get('service_width')[$i], - 'height' => $request->get('service_height')[$i], - 'unit' => $request->get('service_setup_unit')[$i], - 'setup_number' => $request->get('setup_number')[$i], + ProductService::create([ + 'order_id' => $order->id, + 'service_file_id' => $serviceFile->id, + 'service_type' => $request->get('service_type')[$i], + 'placement' => $request->get('placement')[$i], + 'amount' => $request->get('amount')[$i], + 'amount_price' => $request->get('amount_price')[$i], ]); + } - return redirect()->route('order-products.create', ['order' => $order->id]); + return redirect()->route('orders.show', $order); } - public function show($id) + public function show(int $id): Factory|\Illuminate\Contracts\View\View|Application|View { return view('orders.show', [ 'order' => Order::find($id), @@ -111,7 +112,7 @@ class OrderController extends Controller ]); } - public function edit($id) {} + public function edit(int $id) {} public function update(Request $request, $id) {} diff --git a/app/Http/Controllers/OrderProductController.php b/app/Http/Controllers/OrderProductController.php index e283cb6..6aa9db8 100644 --- a/app/Http/Controllers/OrderProductController.php +++ b/app/Http/Controllers/OrderProductController.php @@ -2,24 +2,27 @@ namespace App\Http\Controllers; +use Illuminate\Contracts\View\Factory; +use Illuminate\Foundation\Application; use Illuminate\Http\Request; +use Illuminate\View\View; class OrderProductController extends Controller { - public function index() {} + public function index(): void {} - public function create() + public function create(): Factory|\Illuminate\Contracts\View\View|Application|View { return view('order-products.create'); } - public function store(Request $request) {} + public function store(Request $request): void {} - public function show($id) {} + public function show($id): void {} - public function edit($id) {} + public function edit($id): void {} - public function update(Request $request, $id) {} + public function update(Request $request, $id): void {} - public function destroy($id) {} + public function destroy($id): void {} } diff --git a/app/Http/Controllers/PackingSlipController.php b/app/Http/Controllers/PackingSlipController.php index 9fa5c4e..a6f23da 100644 --- a/app/Http/Controllers/PackingSlipController.php +++ b/app/Http/Controllers/PackingSlipController.php @@ -5,15 +5,16 @@ namespace App\Http\Controllers; use App\Http\Requests\PackingSlipRequest; use App\Models\Customer; use App\Models\PackingSlip; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; class PackingSlipController extends Controller { - public function index() {} + public function index(): void {} - public function create() {} + public function create(): void {} - public function store(PackingSlipRequest $request) + public function store(PackingSlipRequest $request): RedirectResponse { PackingSlip::create($request->validated()); @@ -27,11 +28,11 @@ class PackingSlipController extends Controller return redirect()->back(); //todo: change to packing slips page } - public function show($id) {} + public function show($id): void {} - public function edit($id) {} + public function edit($id): void {} - public function update(Request $request, $id) {} + public function update(Request $request, $id): void {} - public function destroy($id) {} + public function destroy($id): void {} } diff --git a/app/Http/Requests/OrderRequest.php b/app/Http/Requests/OrderRequest.php index 8236ac5..247d439 100644 --- a/app/Http/Requests/OrderRequest.php +++ b/app/Http/Requests/OrderRequest.php @@ -12,6 +12,7 @@ class OrderRequest extends FormRequest public function rules(): array { return [ + // Order 'customer_id' => ['required', 'exists:customers,id'], 'contact_id' => ['nullable', 'exists:contacts,id'], 'customer_po' => ['required', 'string'], @@ -26,6 +27,14 @@ class OrderRequest extends FormRequest 'purchased_garments' => ['nullable'], 'customer_supplied_file' => ['nullable'], 'notes' => ['nullable'], + + // Order Products + + // Product Sizes + + // Product Services + + // Service Files ]; } diff --git a/app/Livewire/CreateOrder.php b/app/Livewire/CreateOrder.php index 7d26fa7..5d2bea1 100644 --- a/app/Livewire/CreateOrder.php +++ b/app/Livewire/CreateOrder.php @@ -5,6 +5,7 @@ namespace App\Livewire; use App\Enums\OrderStatus; use App\Enums\OrderType; use App\Models\Customer; +use Illuminate\Contracts\View\View; use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\Carbon; use Livewire\Component; @@ -17,18 +18,18 @@ class CreateOrder extends Component public $contacts; - public function mount(Collection $customers) + public function mount(Collection $customers): void { $this->customers = $customers; $this->contacts = $customers->first()->contacts; } - public function getContacts() + public function getContacts(): void { $this->contacts = Customer::find($this->selectedCustomer)->contacts; } - public function render() + public function render(): View { return view('livewire.create-order', [ 'contacts' => $this->contacts, diff --git a/app/Livewire/OrderProductsCreate.php b/app/Livewire/OrderProductsCreate.php index 2f9db1d..5c4ccac 100644 --- a/app/Livewire/OrderProductsCreate.php +++ b/app/Livewire/OrderProductsCreate.php @@ -11,17 +11,19 @@ use Livewire\Component; class OrderProductsCreate extends Component { + /** @var Collection */ public Collection $productInputs; + /** @var Collection */ public Collection $serviceInputs; - /** - * @var array - */ + /** @var array */ public array $sizes = []; + /** @var array */ public array $totals = []; + /** @var array */ public array $units = []; /** diff --git a/app/Models/Order.php b/app/Models/Order.php index a7f49b3..18a8935 100644 --- a/app/Models/Order.php +++ b/app/Models/Order.php @@ -57,6 +57,28 @@ class Order extends Model return 'TN'.$year.'-'.$po; } + public function totalProductQuantity(): int + { + $total = 0; + + foreach ($this->orderProducts as $product) { + $total += $product->totalQuantity(); + } + + return $total; + } + + public function totalServicePrice(): string + { + $total = 0; + + foreach ($this->productServices as $service) { + $total += $service->amount * $service->amount_price; + } + + return number_format($total, 2); + } + public function active(): bool { if ($this->status == OrderStatus::APPROVED @@ -113,6 +135,14 @@ class Order extends Model return $this->belongsTo(Customer::class); } + /** + * @return BelongsTo + */ + public function contact(): BelongsTo + { + return $this->belongsTo(Contact::class); + } + /** * @return HasMany */ diff --git a/app/Models/OrderProduct.php b/app/Models/OrderProduct.php index c5be45c..75ce673 100644 --- a/app/Models/OrderProduct.php +++ b/app/Models/OrderProduct.php @@ -22,6 +22,11 @@ class OrderProduct extends Model 'color', ]; + public function totalQuantity(): int + { + return array_sum($this->productSizes()->pluck('amount')->toArray()); + } + /** * @return BelongsTo */ @@ -41,7 +46,7 @@ class OrderProduct extends Model /** * @return HasMany */ - public function productSize(): HasMany + public function productSizes(): HasMany { return $this->hasMany(ProductSize::class); } diff --git a/app/Models/ProductService.php b/app/Models/ProductService.php index eda51e4..961919c 100644 --- a/app/Models/ProductService.php +++ b/app/Models/ProductService.php @@ -6,7 +6,6 @@ use Database\Factories\ProductServiceFactory; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; -use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Database\Eloquent\SoftDeletes; class ProductService extends Model @@ -16,9 +15,9 @@ class ProductService extends Model protected $fillable = [ 'order_id', + 'service_file_id', 'service_type', 'placement', - 'setup_amount', 'amount', 'amount_price', ]; @@ -32,10 +31,10 @@ class ProductService extends Model } /** - * @return HasOne + * @return BelongsTo */ - public function serviceFile(): HasOne + public function serviceFile(): BelongsTo { - return $this->hasOne(ServiceFile::class); + return $this->BelongsTo(ServiceFile::class); } } diff --git a/app/Models/ServiceFile.php b/app/Models/ServiceFile.php index 597f361..dd5a201 100644 --- a/app/Models/ServiceFile.php +++ b/app/Models/ServiceFile.php @@ -5,7 +5,7 @@ namespace App\Models; use Database\Factories\ServiceFileFactory; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; class ServiceFile extends Model @@ -15,19 +15,17 @@ class ServiceFile extends Model protected $fillable = [ 'code', - 'product_service_id', 'name', 'width', 'height', - 'unit', 'setup_number', ]; /** - * @return BelongsTo + * @return HasMany */ - public function productService(): BelongsTo + public function productService(): HasMany { - return $this->belongsTo(ProductService::class); + return $this->HasMany(ProductService::class); } } diff --git a/database/factories/ProductServiceFactory.php b/database/factories/ProductServiceFactory.php index 68538b7..277576e 100644 --- a/database/factories/ProductServiceFactory.php +++ b/database/factories/ProductServiceFactory.php @@ -15,9 +15,8 @@ class ProductServiceFactory extends Factory return [ 'created_at' => Carbon::now(), 'updated_at' => Carbon::now(), - 'service_type' => $this->faker->randomElement(['embroidery', 'screen printing', 'dtg', 'vinyl']), + 'service_type' => $this->faker->randomElement(['emb', 'scp', 'dtg', 'vinyl']), 'placement' => $this->faker->randomElement(['l/c', 'c/f', 'f/b', 'r/c']), - 'setup_amount' => 0, 'amount' => $this->faker->randomNumber(1), 'amount_price' => 0, ]; diff --git a/database/factories/ServiceFileFactory.php b/database/factories/ServiceFileFactory.php index 6a2dc22..36ebf03 100644 --- a/database/factories/ServiceFileFactory.php +++ b/database/factories/ServiceFileFactory.php @@ -20,6 +20,7 @@ class ServiceFileFactory extends Factory 'width' => round($this->faker->randomFloat(2, 0, 10), 1), 'height' => round($this->faker->randomFloat(2, 0, 10), 1), 'unit' => 'inch', + 'notes' => $this->faker->randomElement(['1) 1149 2) grey 3) white', '1) white', '1) black 2) white']), ]; } } diff --git a/database/migrations/2024_09_10_224947_create_product_services_table.php b/database/migrations/2024_09_10_224947_create_product_services_table.php index b176300..8a2fbeb 100644 --- a/database/migrations/2024_09_10_224947_create_product_services_table.php +++ b/database/migrations/2024_09_10_224947_create_product_services_table.php @@ -11,9 +11,9 @@ return new class extends Migration Schema::create('product_services', function (Blueprint $table) { $table->id(); $table->foreignId('order_id'); + $table->foreignId('service_file_id'); $table->string('service_type'); $table->string('placement'); - $table->string('setup_amount'); $table->string('amount')->nullable(); $table->string('amount_price')->nullable(); $table->softDeletes(); diff --git a/database/migrations/2024_09_10_225029_create_service_files_table.php b/database/migrations/2024_09_10_225029_create_service_files_table.php index 91c3bca..8d89d5d 100644 --- a/database/migrations/2024_09_10_225029_create_service_files_table.php +++ b/database/migrations/2024_09_10_225029_create_service_files_table.php @@ -10,14 +10,13 @@ return new class extends Migration { Schema::create('service_files', function (Blueprint $table) { $table->id(); - $table->foreignId('product_service_id')->constrained(); $table->string('code'); $table->string('name'); - $table->string('placement'); $table->decimal('width')->nullable(); $table->decimal('height')->nullable(); $table->string('unit')->default('inch'); $table->integer('setup_number')->nullable(); + $table->string('notes')->nullable(); $table->softDeletes(); $table->timestamps(); }); diff --git a/database/seeders/CustomerSeeder.php b/database/seeders/CustomerSeeder.php index 55f3048..821f2a3 100644 --- a/database/seeders/CustomerSeeder.php +++ b/database/seeders/CustomerSeeder.php @@ -9,6 +9,7 @@ use App\Models\OrderProduct; use App\Models\PackingSlip; use App\Models\ProductService; use App\Models\ProductSize; +use App\Models\ServiceFile; use App\Models\ShippingEntry; use Illuminate\Database\Seeder; @@ -16,16 +17,18 @@ class CustomerSeeder extends Seeder { public function run(): void { - Customer::factory(3) - ->has(Contact::factory(5)) - ->has(PackingSlip::factory(30)) - ->has(ShippingEntry::factory(2)) - ->has(Order::factory(10) - ->has(OrderProduct::factory(2) - ->has(ProductSize::factory(3))) - ->has(ProductService::factory(3))) -// ->has(ServiceFile::factory(1)))) - ->create(); + for ($i = 0; $i < 10; $i++) { + Customer::factory() + ->has(Contact::factory(rand(1, 5))) + ->has(PackingSlip::factory(rand(1, 10))) + ->has(ShippingEntry::factory(rand(1, 3))) + ->has(Order::factory(rand(2, 10)) + ->has(OrderProduct::factory(rand(1, 10)) + ->has(productSize::factory(rand(1, 8)))) + ->has(ProductService::factory(rand(1, 10)) + ->for(ServiceFile::factory()))) + ->create(); + } Customer::factory([ 'company_name' => 'Genumark', @@ -86,7 +89,11 @@ class CustomerSeeder extends Seeder 'notify' => 'Jane Wellman', 'notes' => 'Don\'t CC Kathlyn for SOF orders', ])) - ->has(Order::factory(10)) + ->has(Order::factory(10) + ->has(OrderProduct::factory(rand(1, 10)) + ->has(productSize::factory(rand(1, 8)))) + ->has(ProductService::factory(rand(1, 10)) + ->for(ServiceFile::factory()))) ->create(); } } diff --git a/resources/views/livewire/order-products-create.blade.php b/resources/views/livewire/order-products-create.blade.php index bcc1a9d..5ed0ec3 100644 --- a/resources/views/livewire/order-products-create.blade.php +++ b/resources/views/livewire/order-products-create.blade.php @@ -157,135 +157,138 @@ - -
-
-
#
-
Service
-
Placement
-
Logo Name
- -
-
-
Setup
-
Width
-
Height
-
Unit
-
Price
-
Total
-
+
+ + +
+
+
#
+
Service
+
Placement
+
Logo Name
+ +
+
+
Setup
+
Width
+
Height
+
Unit
+
Price
+
Total
+
+
-
- + - @foreach($serviceInputs as $key => $value) -
+ @foreach($serviceInputs as $key => $value) +
- + -
-
-
-
{{$loop->index+1}}
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- @if($key > 0) - - @endif +
+
+
+
{{$loop->index+1}}
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ @if($key > 0) + + @endif +
-
-
-
-
- -
+
+
+
+ +
-
+
+
-
- @endforeach + @endforeach +
{{--
--}}
diff --git a/resources/views/livewire/orders-table.blade.php b/resources/views/livewire/orders-table.blade.php index 93bb7c4..52a8bd6 100644 --- a/resources/views/livewire/orders-table.blade.php +++ b/resources/views/livewire/orders-table.blade.php @@ -88,8 +88,7 @@ @endif - + diff --git a/resources/views/orders/create.blade.php b/resources/views/orders/create.blade.php index 49ec647..08d4728 100644 --- a/resources/views/orders/create.blade.php +++ b/resources/views/orders/create.blade.php @@ -59,8 +59,7 @@
- +
+ @else + + @endif +
-
- +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+ {{$order->internal_po}} +
+
+ +
+ +
+ {{$order->customer_po}} +
+
+ +
+ +
+ +
+ @if($order->new_art) +
+ + +
+ @endif + @if($order->rush) +
+ + +
+ @endif + @if($order->digitizing) +
+ + +
+ @endif + + @if($order->customer_supplied_file) +
+ + +
+ @endif + + @if($order->repeat) +
+ + +
+ @endif + + @if($order->event) +
+ + +
+ @endif + @if($order->purchased_garments) +
+ + +
+ @endif +
+
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ + +
+ {{$order->notes}} +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + @foreach($order->orderProducts as $key => $product) + + + + + + + + + + + + + + + + + + @endforeach + + +
#SKUProduct NameColorXSSMLXL2XL3XLOSFATotal
{{$loop->index+1}} + + {{$product->sku}} + + + {{$product->product_name}} + + + {{$product->color}} + + + {{$product->productSizes()->get()->where('size', 'xs')->first()->amount ?? ''}} + + + {{$product->productSizes()->get()->where('size', 's')->first()->amount ?? ''}} + + + {{$product->productSizes()->get()->where('size', 'm')->first()->amount ?? ''}} + + + {{$product->productSizes()->get()->where('size', 'l')->first()->amount ?? ''}} + + + + {{$product->productSizes()->get()->where('size', 'xl')->first()->amount ?? ''}} + + + {{$product->productSizes()->get()->where('size', '2xl')->first()->amount ?? ''}} + + + {{$product->productSizes()->get()->where('size', '3xl')->first()->amount ?? ''}} + + + {{$product->productSizes()->get()->where('size', 'osfa')->first()->amount ?? ''}} + + {{$product->totalQuantity()}} + + +
+ +
+ + + +
+ + +
+ + +
+
+
#
+
Service
+
Placement
+
Logo Name
+ +
+
+
Setup
+
Width
+
Height
+
Unit
+
Price
+
Total
+
+
+
+
+ + + + @foreach($order->productServices as $key => $service) +
+ +
+
+
+
{{$loop->index+1}}
+
+ + {{$service->service_type}} +
+
+ {{$service->placement}} +
+
+ {{$service->serviceFile->name }} +
+
+
+
+ {{$service->serviceFile->setup_number}} +
+
+ {{$service->serviceFile->width}} +
+
+ {{$service->serviceFile->height}} +
+
+ {{$service->amount}} +
+
+ {{$service->amount_price != 0 ? $service->amount_price : ''}} +
+
+ {{$service->amount_price != 0 ? '$' . number_format($service->amount_price*$service->amount, 2) : ''}} +
+
+
+
+
+
+
+ + {{$service->serviceFile->code}} + +
+ +
+ {{$service->serviceFile->notes}} +
+
+
+
+
+ @endforeach
-
- +
+ +
diff --git a/resources/views/partials/management/index/customers.blade.php b/resources/views/partials/management/index/customers.blade.php index bfb7b13..ab445c3 100644 --- a/resources/views/partials/management/index/customers.blade.php +++ b/resources/views/partials/management/index/customers.blade.php @@ -35,7 +35,7 @@
@if(sizeof($customers) !== 0) - +
@@ -57,8 +57,7 @@ diff --git a/resources/views/partials/management/index/service-files.blade.php b/resources/views/partials/management/index/service-files.blade.php index c5da197..9320cda 100644 --- a/resources/views/partials/management/index/service-files.blade.php +++ b/resources/views/partials/management/index/service-files.blade.php @@ -1,5 +1,31 @@
+
+
+
Company Name {{$customer->billing_address}} {{$customer->phone}} - +
+ + + + + + + + + @foreach($serviceFiles as $file) + + + + + + + + @endforeach + +
CodeNameWidthHeightSetup Number
{{$file->code}}{{$file->name}}{{$file->width}}{{$file->height}}{{$file->setup_number}}
+ + {{$serviceFiles->links()}} + +
+
- Files