Small cleanups
This commit is contained in:
parent
d9ca6ec6ba
commit
95abaa78a3
@ -26,7 +26,6 @@ class ProductService extends Model
|
|||||||
'amount',
|
'amount',
|
||||||
'amount_price',
|
'amount_price',
|
||||||
'notes',
|
'notes',
|
||||||
'size_unit',
|
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $appends = [
|
protected $appends = [
|
||||||
|
@ -15,7 +15,6 @@ public function up(): void
|
|||||||
$table->foreignId('service_file_id')->nullable();
|
$table->foreignId('service_file_id')->nullable();
|
||||||
$table->foreignId('service_type_id')->nullable();
|
$table->foreignId('service_type_id')->nullable();
|
||||||
|
|
||||||
// $table->string('service_type')->nullable();
|
|
||||||
$table->string('placement')->nullable();
|
$table->string('placement')->nullable();
|
||||||
$table->string('amount')->nullable();
|
$table->string('amount')->nullable();
|
||||||
$table->string('amount_price')->nullable();
|
$table->string('amount_price')->nullable();
|
||||||
|
@ -16,7 +16,6 @@ public function up(): void
|
|||||||
$table->decimal('height')->nullable();
|
$table->decimal('height')->nullable();
|
||||||
$table->string('unit')->default('inch');
|
$table->string('unit')->default('inch');
|
||||||
$table->integer('setup_number')->nullable();
|
$table->integer('setup_number')->nullable();
|
||||||
// $table->string('notes')->nullable();
|
|
||||||
$table->softDeletes();
|
$table->softDeletes();
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
});
|
});
|
||||||
|
@ -156,8 +156,8 @@
|
|||||||
@foreach($order->orderProducts as $product)
|
@foreach($order->orderProducts as $product)
|
||||||
<tr>
|
<tr>
|
||||||
<td><code style="font-size: 0.9rem;">{{$product->sku}}</code></td>
|
<td><code style="font-size: 0.9rem;">{{$product->sku}}</code></td>
|
||||||
<td class="text-uppercase">{{$product->product_name}}</td>
|
<td class="text-uppercase">{{$product->product_name ?? ''}}</td>
|
||||||
<td class="text-uppercase">{{$product->color}}</td>
|
<td class="text-uppercase">{{$product->color ?? ''}}</td>
|
||||||
<td style="width: 40px;">{{$product->productSizes()->get()->where('size', 'xs')->first()->amount ?? ''}}</td>
|
<td style="width: 40px;">{{$product->productSizes()->get()->where('size', 'xs')->first()->amount ?? ''}}</td>
|
||||||
<td style="width: 40px;">{{$product->productSizes()->get()->where('size', 's')->first()->amount ?? ''}}</td>
|
<td style="width: 40px;">{{$product->productSizes()->get()->where('size', 's')->first()->amount ?? ''}}</td>
|
||||||
<td style="width: 40px;">{{$product->productSizes()->get()->where('size', 'm')->first()->amount ?? ''}}</td>
|
<td style="width: 40px;">{{$product->productSizes()->get()->where('size', 'm')->first()->amount ?? ''}}</td>
|
||||||
@ -176,7 +176,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="row mt-3 text-end" style="font-size: 12px">
|
<div class="row mt-3 text-end" style="font-size: 12px">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
TOTAL QUANTITY: {{$order->totalProductQuantity}}
|
TOTAL QUANTITY: {{$order->totalProductQuantity ?? ''}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -199,7 +199,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<div class="text-uppercase fw-bold">
|
<div class="text-uppercase fw-bold">
|
||||||
{{$service->placement}}
|
{{$service->placement ?? ''}}
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
<div class="text-uppercase">
|
<div class="text-uppercase">
|
||||||
@ -221,13 +221,13 @@
|
|||||||
{{$service->serviceFile->width}}
|
{{$service->serviceFile->width}}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{$service->serviceFile->height}}
|
{{$service->serviceFile->height ?? ''}}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{$service->serviceFile->size_unit}}
|
{{$service->serviceFile->size_unit ?? ''}}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{$service->amount}}
|
{{$service->amount ?? ''}}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user