Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
onestartup-shop
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Angel Martin
onestartup-shop
Commits
e0ec7180
Commit
e0ec7180
authored
Sep 18, 2018
by
Francisco Salazar
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of bunkrbit.com:bsabbath/onestartup-shop
parents
771685d1
c6c5e025
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
15 deletions
+33
-15
shop.php
src/config/shop.php
+1
-0
orden.blade.php
src/views/clients/orden.blade.php
+14
-4
order.blade.php
src/views/mail/resumen/order.blade.php
+4
-0
fields.blade.php
src/views/product/fields.blade.php
+14
-11
No files found.
src/config/shop.php
View file @
e0ec7180
<?php
return
[
"slug-shop"
=>
"tienda"
,
"billing_enabled"
=>
false
,
"slug-shop-category"
=>
"categoria"
,
"product-index"
=>
[
"pagination"
=>
15
,
...
...
src/views/clients/orden.blade.php
View file @
e0ec7180
...
...
@@ -33,9 +33,15 @@ setlocale(LC_MONETARY, 'en_US');
</
a
>
</
li
>
<
li
class
="
nav
-
item
">
<a class="
nav
-
link
block
" href="" data-toggle="
tab
" data-target="
#tab-3">
<
h6
>
Envio
y
factura
</
h6
>
</
a
>
@if(config("
shop
.
billing_enabled
"))
<a class="
nav
-
link
block
" href="" data-toggle="
tab
" data-target="
#tab-3">
<
h6
>
Envio
y
factura
</
h6
>
</
a
>
@
else
<
a
class
="
nav
-
link
block
" href="" data-toggle="
tab
" data-target="
#tab-3">
<
h6
>
Envio
</
h6
>
</
a
>
@
endif
</
li
>
@
if
(
$variable
->
count
()
>
0
)
<
li
class
="
nav
-
item
">
...
...
@@ -65,7 +71,9 @@ setlocale(LC_MONETARY, 'en_US');
<p>Correo: <b>
{
{$client->email}
}
</b></p>
<p>Fecha de registro: <b>
{
{$client->created_at}
}
</b></p>
@if(
$shipping
!= null)
<p>Requiere factura: <b>
{
{$shipping->facturacion}
}
</b></p>
@if(config("
shop
.
billing_enabled
"))
<p>Requiere factura: <b>
{
{$shipping->facturacion}
}
</b></p>
@endif
@endif
</div>
...
...
@@ -223,6 +231,7 @@ setlocale(LC_MONETARY, 'en_US');
<div class="
box
-
body
">
<div class="
row
">
@if(config("
shop
.
billing_enabled
"))
<div class="
col
-
md
-
6
">
<h4>Datos de facturación</h4>
<p>
...
...
@@ -283,6 +292,7 @@ setlocale(LC_MONETARY, 'en_US');
</a>
@endif
</div>
@endif
<div class="
col
-
md
-
6
">
...
...
src/views/mail/resumen/order.blade.php
View file @
e0ec7180
...
...
@@ -41,12 +41,16 @@ Datos del comprador:
@
component
(
'mail::panel'
)
@
if
(
config
(
"shop.billing_enabled"
))
Facturación
:
-
Requiere
factura
:
***
{{
$order
->
facturacion
}}
***
@
if
(
$order
->
facturacion
==
'Si'
)
[
Rellenar
formulario
de
facturación
]({{
route
(
'cart.facturacion'
,
\Crypt
::
encryptString
(
$order
->
id
))}})
@
endif
@
endif
@
if
(
$shipping
!=
null
)
Datos
de
envio
:
...
...
src/views/product/fields.blade.php
View file @
e0ec7180
...
...
@@ -56,9 +56,9 @@
<div
class=
"row"
>
<div
class=
"col-md-6"
>
<div
class=
"form-group"
>
{!! Form::label('
category_sat_id', 'Categoría del sat
', ['class'=>'control-label'])!!}
{!! Form::
select('category_sat_id', $categoria_sat, null, ["class"=>"form-control", 'placeholder'=>'Elije una categoria'
]) !!}
<div
class=
"form-group"
>
{!! Form::label('
publication_date', 'Fecha de publicación
', ['class'=>'control-label'])!!}
{!! Form::
text('publication_date', isset($product) ? null: date('Y-m-d'), ["class"=>"form-control", "required"=>"required", "id"=>"publication_date"
]) !!}
</div>
</div>
<div
class=
"col-md-6"
>
...
...
@@ -67,16 +67,19 @@
{!! Form::select('tags[]', $tags, null, ["class"=>"form-control", "id"=>"tags", "multiple"=>"multiple"]) !!}
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-md-6"
>
<div
class=
"form-group"
>
{!! Form::label('publication_date', 'Fecha de publicación', ['class'=>'control-label'])!!}
{!! Form::text('publication_date', isset($product) ? null: date('Y-m-d'), ["class"=>"form-control", "required"=>"required", "id"=>"publication_date"]) !!}
</div>
@if(config("shop.billing_enabled"))
<div
class=
"row"
>
<div
class=
"col-md-6"
>
<div
class=
"form-group"
>
{!! Form::label('category_sat_id', 'Categoría del sat', ['class'=>'control-label'])!!}
{!! Form::select('category_sat_id', $categoria_sat, null, ["class"=>"form-control", 'placeholder'=>'Elije una categoria']) !!}
</div>
</div>
</div>
</div>
@endif
<div
class=
"row"
>
@if($extras->count() > 0)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment