minor fixes
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace App\Http\Controllers\Admin\Shop;
|
||||
|
||||
use App\Datatables\Shop\CustomerAddressesDataTable;
|
||||
use App\Datatables\Admin\Shop\CustomerAddressesDataTable;
|
||||
use App\Repositories\Shop\CustomerAddresses;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
|
||||
@@ -5,21 +5,20 @@ namespace App\Http\Controllers\Admin\Shop;
|
||||
use App\Datatables\Admin\Shop\CustomerAddressesDataTable;
|
||||
use App\Datatables\Admin\Shop\CustomersDataTable;
|
||||
use App\Repositories\Shop\Customers;
|
||||
use App\Repositories\Shop\Deliveries;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class CustomerController extends Controller
|
||||
{
|
||||
public function index(CustomersDataTable $dataTable)
|
||||
{
|
||||
$data = [];
|
||||
$data = Customers::init();
|
||||
|
||||
return $dataTable->render('Admin.Shop.Customers.list', $data);
|
||||
}
|
||||
|
||||
public function create()
|
||||
{
|
||||
$data['deliveries'] = Deliveries::getOptions();
|
||||
$data = Customers::init();
|
||||
|
||||
return view('Admin.Shop.Customers.create', $data);
|
||||
}
|
||||
@@ -40,8 +39,8 @@ class CustomerController extends Controller
|
||||
|
||||
public function edit($id)
|
||||
{
|
||||
$data = Customers::init();
|
||||
$data['customer'] = Customers::edit($id);
|
||||
$data['deliveries'] = Deliveries::getOptions();
|
||||
$model = new CustomerAddressesDataTable();
|
||||
$data['customer_addresses'] = $model->html();
|
||||
|
||||
|
||||
@@ -4,21 +4,20 @@ namespace App\Http\Controllers\Admin\Shop;
|
||||
|
||||
use App\Datatables\Admin\Shop\DeliveriesDataTable;
|
||||
use App\Repositories\Shop\Deliveries;
|
||||
use App\Repositories\Shop\SaleChannels;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class DeliveryController extends Controller
|
||||
{
|
||||
public function index(DeliveriesDataTable $dataTable)
|
||||
{
|
||||
return $dataTable->render('Admin.Shop.Deliveries.list');
|
||||
$data = Deliveries::init();
|
||||
|
||||
return $dataTable->render('Admin.Shop.Deliveries.list', $data);
|
||||
}
|
||||
|
||||
public function create()
|
||||
{
|
||||
$data = [
|
||||
'sale_channels' => SaleChannels::getOptions(),
|
||||
];
|
||||
$data = Deliveries::init();
|
||||
|
||||
return view('Admin.Shop.Deliveries.create', $data);
|
||||
}
|
||||
@@ -41,10 +40,8 @@ class DeliveryController extends Controller
|
||||
|
||||
public function edit($id)
|
||||
{
|
||||
$data = [
|
||||
'delivery' => Deliveries::get($id)->toArray(),
|
||||
'sale_channels' => SaleChannels::getOptions(),
|
||||
];
|
||||
$data = Deliveries::init();
|
||||
$data['delivery'] = Deliveries::getArray($id);
|
||||
|
||||
return view('Admin.Shop.Deliveries.edit', $data);
|
||||
}
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
namespace App\Http\Controllers\Admin\Shop;
|
||||
|
||||
use App\Datatables\Admin\Shop\InvoicesDataTable;
|
||||
use App\Datatables\Admin\Shop\InvoicePaymentsDataTable;
|
||||
use App\Datatables\Admin\Shop\InvoicesDataTable;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Repositories\Shop\Invoices;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
@@ -18,7 +18,7 @@ class InvoicePaymentController extends Controller
|
||||
{
|
||||
$data = InvoicePayments::init();
|
||||
|
||||
return view('Admin.Shop.InvoicePayments.create' , $data);
|
||||
return view('Admin.Shop.InvoicePayments.create', $data);
|
||||
}
|
||||
|
||||
public function store(Request $request)
|
||||
|
||||
@@ -5,9 +5,6 @@ namespace App\Http\Controllers\Admin\Shop;
|
||||
use App\Datatables\Admin\Shop\PriceListsDataTable;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Repositories\Shop\PriceLists;
|
||||
use App\Repositories\Shop\SaleChannels;
|
||||
use App\Repositories\Shop\Tariffs;
|
||||
use App\Repositories\Shop\Taxes;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class PriceListController extends Controller
|
||||
|
||||
@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Admin\Shop;
|
||||
|
||||
use App\Datatables\Admin\Shop\ProducersDataTable;
|
||||
use App\Repositories\Shop\Producers;
|
||||
use App\Repositories\Shop\TagGroups;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class ProducerController extends Controller
|
||||
|
||||
@@ -2,11 +2,8 @@
|
||||
|
||||
namespace App\Http\Controllers\Admin\Shop;
|
||||
|
||||
use App\Datatables\Admin\Shop\PriceListsDataTable;
|
||||
use App\Datatables\Admin\Shop\TariffsDataTable;
|
||||
use App\Repositories\Shop\SaleChannels;
|
||||
use App\Repositories\Shop\Tariffs;
|
||||
use App\Repositories\Shop\TariffUnities;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class TariffController extends Controller
|
||||
|
||||
@@ -4,8 +4,6 @@ namespace App\Http\Controllers\Admin\Shop;
|
||||
|
||||
use App\Datatables\Admin\Shop\VariationsDataTable;
|
||||
use App\Http\Requests\Admin\Shop\StoreVariationPost;
|
||||
use App\Repositories\Shop\Packages;
|
||||
use App\Repositories\Shop\Unities;
|
||||
use App\Repositories\Shop\Variations;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user