@@ -151,9 +151,9 @@ discard block |
||
| 151 | 151 | <?php |
| 152 | 152 | $template_controller = new \App\Http\Controllers\Common\TemplateController(); |
| 153 | 153 | $user = $client; |
| 154 | - $invoiceItems= \App\Model\Order\InvoiceItem::where('invoice_id',$invoice->id)->get(); |
|
| 155 | - $body = view('themes.default1.invoice.show',compact('invoice','user','invoiceItems'))->render(); |
|
| 156 | - $model_popup = $template_controller->popup('Invoice',$body , 'execute order', 'invoice' . $invoice->id); |
|
| 154 | + $invoiceItems = \App\Model\Order\InvoiceItem::where('invoice_id', $invoice->id)->get(); |
|
| 155 | + $body = view('themes.default1.invoice.show', compact('invoice', 'user', 'invoiceItems'))->render(); |
|
| 156 | + $model_popup = $template_controller->popup('Invoice', $body, 'execute order', 'invoice' . $invoice->id); |
|
| 157 | 157 | ?> |
| 158 | 158 | <ul class="dropdown-menu" role="menu"> |
| 159 | 159 | <li><a href=# class=null data-toggle='modal' data-target="#editinvoice{{$invoice->id}}">execute order</a></li> |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | </thead> |
| 196 | 196 | <tbody> |
| 197 | 197 | @forelse($orders as $order) |
| 198 | - <?php $payment = \App\Model\Order\Payment::where('invoice_id',$order->invoice_id)->first(); ?> |
|
| 198 | + <?php $payment = \App\Model\Order\Payment::where('invoice_id', $order->invoice_id)->first(); ?> |
|
| 199 | 199 | <tr> |
| 200 | 200 | <td>{{$order->created_at}}</td> |
| 201 | 201 | <td> |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | |
| 44 | 44 | <div class="col-md-12"> |
| 45 | 45 | |
| 46 | - <?php $set = App\Model\Common\Setting::where('id', '1')->first();?> |
|
| 46 | + <?php $set = App\Model\Common\Setting::where('id', '1')->first(); ?> |
|
| 47 | 47 | <!-- Main content --> |
| 48 | 48 | <section class="invoice"> |
| 49 | 49 | <!-- title row --> |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | | |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | -require __DIR__.'/../bootstrap/autoload.php'; |
|
| 21 | +require __DIR__ . '/../bootstrap/autoload.php'; |
|
| 22 | 22 | |
| 23 | 23 | /* |
| 24 | 24 | |-------------------------------------------------------------------------- |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | | |
| 33 | 33 | */ |
| 34 | 34 | |
| 35 | -$app = require_once __DIR__.'/../bootstrap/app.php'; |
|
| 35 | +$app = require_once __DIR__ . '/../bootstrap/app.php'; |
|
| 36 | 36 | |
| 37 | 37 | /* |
| 38 | 38 | |-------------------------------------------------------------------------- |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('templates', function (Blueprint $table) { |
|
| 15 | + Schema::create('templates', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('name'); |
| 18 | 18 | $table->integer('type')->unsigned(); |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('jobs', function (Blueprint $table) { |
|
| 15 | + Schema::create('jobs', function(Blueprint $table) { |
|
| 16 | 16 | $table->bigIncrements('id'); |
| 17 | 17 | $table->string('queue'); |
| 18 | 18 | $table->longText('payload'); |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('frontend_pages', function (Blueprint $table) { |
|
| 15 | + Schema::create('frontend_pages', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->integer('parent_page_id'); |
| 18 | 18 | $table->string('slug'); |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('template_types', function (Blueprint $table) { |
|
| 15 | + Schema::create('template_types', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('name'); |
| 18 | 18 | $table->timestamps(); |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('product_bundle_relations', function (Blueprint $table) { |
|
| 15 | + Schema::create('product_bundle_relations', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->integer('product_id')->unsigned(); |
| 18 | 18 | $table->foreign('product_id')->references('id')->on('products'); |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('group_features', function (Blueprint $table) { |
|
| 15 | + Schema::create('group_features', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->integer('group_id')->unsigned(); |
| 18 | 18 | $table->foreign('group_id')->references('id')->on('product_groups'); |