Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
kohinos-tav
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
agplv3
kohinos-tav
Commits
797782ea
Commit
797782ea
authored
Feb 21, 2024
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add products by family selection for presta
parent
93be6e6b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
32 additions
and
22 deletions
+32
-22
app.css
assets/css/app.css
+4
-2
app.56026e04.css
public/build/app.56026e04.css
+0
-0
entrypoints.json
public/build/entrypoints.json
+1
-1
manifest.json
public/build/manifest.json
+1
-1
sw.js
public/sw.js
+0
-0
Prestataire.php
src/Entity/Prestataire.php
+1
-1
PrestataireInfosFormType.php
src/Form/Type/PrestataireInfosFormType.php
+1
-1
PrestataireProductFamilyFormType.php
src/Form/Type/PrestataireProductFamilyFormType.php
+2
-2
infos.html.twig
templates/themes/kohinos/presta/block/infos.html.twig
+22
-14
No files found.
assets/css/app.css
View file @
797782ea
...
...
@@ -352,10 +352,11 @@ form[name="formEncaissement"] label {
.presta-products-family-form-group
{
display
:
flex
;
gap
:
5px
;
align-
content
:
center
;
margin-bottom
:
0.5rem
!important
;
align-
items
:
center
;
margin-bottom
:
0.
2
5rem
!important
;
}
.presta-products-family-form-group
label
{
width
:
40%
;
margin-bottom
:
0
;
}
\ No newline at end of file
public/build/app.
972ba10e
.css
→
public/build/app.
56026e04
.css
View file @
797782ea
This source diff could not be displayed because it is too large. You can
view the blob
instead.
public/build/entrypoints.json
View file @
797782ea
...
...
@@ -6,7 +6,7 @@
"/build/app.2576ca3f.js"
],
"css"
:
[
"/build/app.
972ba10e
.css"
"/build/app.
56026e04
.css"
]
},
"admin"
:
{
...
...
public/build/manifest.json
View file @
797782ea
{
"build/app.css"
:
"/build/app.
972ba10e
.css"
,
"build/app.css"
:
"/build/app.
56026e04
.css"
,
"build/app.js"
:
"/build/app.2576ca3f.js"
,
"build/admin.css"
:
"/build/admin.5dc0eea7.css"
,
"build/admin.js"
:
"/build/admin.cee4d78d.js"
,
...
...
public/sw.js
View file @
797782ea
This diff is collapsed.
Click to expand it.
src/Entity/Prestataire.php
View file @
797782ea
...
...
@@ -353,7 +353,7 @@ class Prestataire extends AccountableObject implements AccountableInterface
private
$lastTransactionsExportDatetime
;
/**
* @ORM\OneToMany(targetEntity=PrestataireProductFamily::class, mappedBy="prestataire", orphanRemoval=true)
* @ORM\OneToMany(targetEntity=PrestataireProductFamily::class, mappedBy="prestataire", orphanRemoval=true
, cascade={"persist"}
)
*/
private
$prestataireProductFamilies
;
...
...
src/Form/Type/PrestataireInfosFormType.php
View file @
797782ea
...
...
@@ -108,7 +108,7 @@ class PrestataireInfosFormType extends AbstractType
'required'
=>
true
,
'allow_add'
=>
true
,
'by_reference'
=>
false
,
'label'
=>
"Produits vendus par famille
:
"
,
'label'
=>
"Produits vendus par famille "
,
]);
}
...
...
src/Form/Type/PrestataireProductFamilyFormType.php
View file @
797782ea
...
...
@@ -19,11 +19,11 @@ class PrestataireProductFamilyFormType extends AbstractType
->
add
(
'productFamily'
,
EntityType
::
class
,
array
(
'class'
=>
ProductFamily
::
class
,
'choice_label'
=>
'name'
,
'label'
=>
'Famille de produits'
,
'label'
=>
'Famille de produits
'
,
'required'
=>
true
,
))
->
add
(
'products'
,
TextType
::
class
,
[
'label'
=>
'Produits'
,
'label'
=>
'Produits
'
,
'required'
=>
true
,
])
;
...
...
templates/themes/kohinos/presta/block/infos.html.twig
View file @
797782ea
...
...
@@ -5,8 +5,26 @@
{%
endblock
blocktitle
%}
{%
block
blocksubtitle
%}
{%
endblock
blocksubtitle
%}
{%
block
blockcontent
%}
{%
set
form
=
getPrestataireInfosForm
(
app.user
)
%}
{# Create "template" as a macro for a product family entry in the form collection #}
{%
import
_self
as
formMacros
%}
{%
macro
printPrestataireProductFamilyForm
(
prestataireProductFamilyForm
)
%}
<div
class=
"presta-products-family"
>
<div
class=
"form-group presta-products-family-form-group"
>
{{
form_label
(
prestataireProductFamilyForm.productFamily
)
}}
{{
form_widget
(
prestataireProductFamilyForm.productFamily
)
}}
</div>
<div
class=
"form-group presta-products-family-form-group"
>
{{
form_label
(
prestataireProductFamilyForm.products
)
}}
{{
form_widget
(
prestataireProductFamilyForm.products
)
}}
</div>
</div>
{%
endmacro
%}
{{
form_start
(
form
)
}}
{{
form_row
(
form.raison
)
}}
{{
form_row
(
form.statut
)
}}
...
...
@@ -29,28 +47,18 @@
{%
endif
%}
{%
if
form.prestataireProductFamilies
is
defined
%}
<hr/>
<h
3>
{{
form_label
(
form.prestataireProductFamilies
)
}}
</h3
>
<h
4>
{{
form_label
(
form.prestataireProductFamilies
)
}}
</h4
>
{{
form_errors
(
form.prestataireProductFamilies
)
}}
<div
class=
"presta-products-families-list"
data-index=
"
{{
form.prestataireProductFamilies
|
length
>
0
?
form.prestataireProductFamilies
|
last
.
vars.name
+
1
:
0
}}
"
data-prototype=
"
{{
form
_widget
(
form.prestataireProductFamilies.vars.prototype
)
|
e
(
'html_attr'
)
}}
"
data-prototype=
"
{{
form
Macros.printPrestataireProductFamilyForm
(
form.prestataireProductFamilies.vars.prototype
)
|
e
(
'html_attr'
)
}}
"
>
{%
for
prestataireProductFamilyForm
in
form.prestataireProductFamilies
%}
<div
class=
"presta-products-family"
>
<div
class=
"form-group presta-products-family-form-group"
>
{{
form_label
(
prestataireProductFamilyForm.productFamily
)
}}
{{
form_widget
(
prestataireProductFamilyForm.productFamily
)
}}
</div>
<div
class=
"form-group presta-products-family-form-group"
>
{{
form_label
(
prestataireProductFamilyForm.products
)
}}
{{
form_widget
(
prestataireProductFamilyForm.products
)
}}
</div>
</div>
{{
formMacros.printPrestataireProductFamilyForm
(
prestataireProductFamilyForm
)
}}
{%
endfor
%}
{# TODO custom template for prototype #}
{%
do
form.prestataireProductFamilies.setRendered
()
%}
</div>
<button
...
...
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