Commit 85c0fafd by Angel MAS

variables adicionales en la orden

parent 072c5667
...@@ -13,6 +13,7 @@ use Onestartup\Shop\Model\ExtraField as Extra; ...@@ -13,6 +13,7 @@ use Onestartup\Shop\Model\ExtraField as Extra;
use Onestartup\Shop\Model\ProductShopInfo as ProductInfo; use Onestartup\Shop\Model\ProductShopInfo as ProductInfo;
use Onestartup\Shop\Model\CategoriaSat; use Onestartup\Shop\Model\CategoriaSat;
use Onestartup\Shop\Model\Billing; use Onestartup\Shop\Model\Billing;
use Onestartup\Shop\Model\VariableExtra as Variable;
use Onestartup\Shop\DataTables\ClientDataTable; use Onestartup\Shop\DataTables\ClientDataTable;
use Onestartup\Shop\DataTables\OrderDataTable; use Onestartup\Shop\DataTables\OrderDataTable;
...@@ -302,6 +303,9 @@ class AdminProductController extends Controller ...@@ -302,6 +303,9 @@ class AdminProductController extends Controller
$promo = null; $promo = null;
$shipping = null; $shipping = null;
$shipping_price = null; $shipping_price = null;
$var = Variable::first();
$variable = $var != null ? $var : new Variable();
if ($sale->coupon != null) { if ($sale->coupon != null) {
$promo = $this->util->getDiscount($sale, $sale->coupon); $promo = $this->util->getDiscount($sale, $sale->coupon);
...@@ -335,13 +339,14 @@ class AdminProductController extends Controller ...@@ -335,13 +339,14 @@ class AdminProductController extends Controller
} }
return view('shop::clients.orden') return view('shop::clients.orden')
->with('sale', $sale) ->with('sale', $sale)
->with('client', $client) ->with('client', $client)
->with('orden', $orden) ->with('orden', $orden)
->with('estado', $estado) ->with('estado', $estado)
->with('promo', $promo) ->with('promo', $promo)
->with('shipping_price', $shipping_price) ->with('shipping_price', $shipping_price)
->with('shipping', $shipping); ->with('variable', $variable)
->with('shipping', $shipping);
} }
public function updateShipping(Request $request, $id) public function updateShipping(Request $request, $id)
...@@ -660,4 +665,35 @@ class AdminProductController extends Controller ...@@ -660,4 +665,35 @@ class AdminProductController extends Controller
->with('message_success', 'Información actualizada'); ->with('message_success', 'Información actualizada');
} }
public function showVars()
{
$variable = Variable::first();
if ($variable == null) {
$variable = new Variable();
}
return view('shop::variable.edit')
->with('variable', $variable);
}
public function postVars(Request $request)
{
$variable = Variable::first();
if ($variable == null) {
$variable = new Variable();
}
$variable->fill($request->all());
$variable->save();
return redirect()
->back()
->with('message_success', 'Información actualizada');
}
} }
...@@ -37,6 +37,8 @@ use PayPal\Api\ItemList; ...@@ -37,6 +37,8 @@ use PayPal\Api\ItemList;
use PayPal\Api\Details; use PayPal\Api\Details;
use Onestartup\Shop\Libs\Util; use Onestartup\Shop\Libs\Util;
use Onestartup\Shop\Model\VariableExtra as Variable;
use Onestartup\Shop\Model\ExtraSaleInfo;
class CartController extends Controller class CartController extends Controller
...@@ -251,6 +253,13 @@ public function shipping() ...@@ -251,6 +253,13 @@ public function shipping()
$sale->save(); $sale->save();
} }
if ($request->additional) {
$additional = new ExtraSaleInfo($request->all());
$sale->info_extra()->save($additional);
}
\Session::put('sale', $sale); \Session::put('sale', $sale);
\Session::put('client', $client); \Session::put('client', $client);
......
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateExtraSaleInfosTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('extra_sale_infos', function (Blueprint $table) {
$table->increments('id');
$table->string('extra1', 455)->nullable();
$table->string('extra2', 455)->nullable();
$table->string('extra3', 455)->nullable();
$table->string('extra4', 455)->nullable();
$table->string('extra5', 455)->nullable();
$table->string('extra6', 455)->nullable();
$table->string('extra7', 455)->nullable();
$table->string('extra8', 455)->nullable();
$table->string('extra9', 455)->nullable();
$table->string('extra10', 455)->nullable();
$table->integer('sale_id')->unsigned();
$table->foreign('sale_id')->references('id')->on('sale_shops');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('extra_sale_infos');
}
}
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateVariableExtrasTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('variable_extras', function (Blueprint $table) {
$table->increments('id');
$table->string('alias1', 455)->nullable();
$table->string('alias2', 455)->nullable();
$table->string('alias3', 455)->nullable();
$table->string('alias4', 455)->nullable();
$table->string('alias5', 455)->nullable();
$table->string('alias6', 455)->nullable();
$table->string('alias7', 455)->nullable();
$table->string('alias8', 455)->nullable();
$table->string('alias9', 455)->nullable();
$table->string('alias10', 455)->nullable();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('variable_extras');
}
}
<?php
namespace Onestartup\Shop\Model;
use Illuminate\Database\Eloquent\Model;
class ExtraSaleInfo extends Model
{
protected $table = 'extra_sale_infos';
protected $fillable = [
'extra1',
'extra2',
'extra3',
'extra4',
'extra5',
'extra6',
'extra7',
'extra8',
'extra9',
'extra10',
'sale_id'
];
public function sale()
{
return $this->belongsTo(SaleShop::class, 'sale_id');
}
}
...@@ -50,4 +50,9 @@ class SaleShop extends Model ...@@ -50,4 +50,9 @@ class SaleShop extends Model
return $this->hasOne('Onestartup\Shop\Model\Billing', 'sale_id'); return $this->hasOne('Onestartup\Shop\Model\Billing', 'sale_id');
} }
public function info_extra()
{
return $this->hasOne(ExtraSaleInfo::class, 'sale_id');
}
} }
<?php
namespace Onestartup\Shop\Model;
use Illuminate\Database\Eloquent\Model;
class VariableExtra extends Model
{
protected $table = 'variable_extras';
protected $fillable = [
'alias1',
'alias2',
'alias3',
'alias4',
'alias5',
'alias6',
'alias7',
'alias8',
'alias9',
'alias10',
'alias11'
];
}
...@@ -103,6 +103,12 @@ Route::group(['middleware' => ['web', 'auth', 'is_admin']], function(){ ...@@ -103,6 +103,12 @@ Route::group(['middleware' => ['web', 'auth', 'is_admin']], function(){
'Onestartup\Shop\Controller\AdminProductController@postConfigs') 'Onestartup\Shop\Controller\AdminProductController@postConfigs')
->name('admin.shop.config_factura.store'); ->name('admin.shop.config_factura.store');
Route::get('admin/shop/variable', 'Onestartup\Shop\Controller\AdminProductController@showVars')
->name('admin.shop.variable');
Route::post('admin/shop/variable', 'Onestartup\Shop\Controller\AdminProductController@postVars')
->name('admin.shop.variable.store');
}); });
......
...@@ -60,6 +60,19 @@ setlocale(LC_MONETARY, 'en_US'); ...@@ -60,6 +60,19 @@ setlocale(LC_MONETARY, 'en_US');
<br> <br>
</section> </section>
<section>
<h4>Información adicional</h4>
{!! Form::hidden('additional', true) !!}
<div class="form-group">
{!! Form::label('extra1', 'Fecha de envío', ['class'=>'']) !!}
{!! Form::text('extra1', null, ['class'=>'form-control', 'required'=>'required']) !!}
</div>
<div>
{!! Form::label('extra2', 'Dedicatoria', ['class'=>'']) !!}
{!! Form::text('extra2', null, ['class'=>'form-control', 'required'=>'required']) !!}
</div>
</section>
{!! Form::submit('Enviar información', ['class'=>'']) !!} {!! Form::submit('Enviar información', ['class'=>'']) !!}
{!! Form::close() !!} {!! Form::close() !!}
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<div class='col-md-12'> <div class='col-md-12'>
<div class='box'> <div class='box'>
<div class='box-header dark'> <div class='box-header dark'>
<h2>Mapeo de variables extras</h2> <h2>Variables extras de información adicional a una compra</h2>
</div> </div>
<div class='box-body'> <div class='box-body'>
<div class='col-md-12'> <div class='col-md-12'>
{!! Form::model($variable,['route'=> ['admin.product.variable.store'],"method"=>"POST"]) !!} {!! Form::model($variable,['route'=> ['admin.shop.variable.store'],"method"=>"POST"]) !!}
@include('product::variable.fields') @include('shop::variable.fields')
</div> </div>
</div> </div>
<div class='dker p-a text-right'> <div class='dker p-a text-right'>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment