Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
third-party
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
2
Merge Requests
2
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
cooperatic-foodcoops
third-party
Commits
59969abd
Commit
59969abd
authored
Feb 08, 2022
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
envelops: small style update
parent
a06fa29c
Pipeline
#1772
passed with stage
in 1 minute 33 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
envelops.css
envelops/static/css/envelops.css
+3
-3
envelops.js
envelops/static/js/envelops.js
+3
-3
index.html
templates/envelops/index.html
+2
-0
No files found.
envelops/static/css/envelops.css
View file @
59969abd
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
margin-bottom
:
15px
;
margin-bottom
:
15px
;
}
}
#cash_envelops
{
#cash_envelops
,
#ch_envelops
,
#archive_cash_envelops
,
#archive_ch_envelops
{
margin-top
:
30px
;
margin-top
:
30px
;
}
}
...
@@ -20,8 +20,8 @@
...
@@ -20,8 +20,8 @@
margin-top
:
30px
;
margin-top
:
30px
;
}
}
.update_envelop_button
,
.delete_envelop_button
{
.update_envelop_button
,
.delete_envelop_button
,
.envelop_comment
{
margin
:
0
0
1
0
px
15px
;
margin
:
0
0
1
5
px
15px
;
}
}
.envelop_content_list
{
.envelop_content_list
{
...
...
envelops/static/js/envelops.js
View file @
59969abd
...
@@ -95,7 +95,7 @@ function set_envelop_dom(envelop, envelop_name, envelop_content_id, envelop_inde
...
@@ -95,7 +95,7 @@ function set_envelop_dom(envelop, envelop_name, envelop_content_id, envelop_inde
new_html
+=
'<button class="accordion w80">'
+
envelop_name
+
' - <i>'
+
total_amount
+
'€</i></button>'
new_html
+=
'<button class="accordion w80">'
+
envelop_name
+
' - <i>'
+
total_amount
+
'€</i></button>'
+
'<button class="btn--success archive_button item-fluid" onClick="openModal(
\'
<h3>Êtes-vous sûr ?</h3>
\'
, function() {archive_envelop(
\'
'
+
envelop
.
type
+
'
\'
, '
+
envelop_index
+
');},
\'
Encaisser
\'
, false)">Encaisser</button>'
;
+
'<button class="btn--success archive_button item-fluid" onClick="openModal(
\'
<h3>Êtes-vous sûr ?</h3>
\'
, function() {archive_envelop(
\'
'
+
envelop
.
type
+
'
\'
, '
+
envelop_index
+
');},
\'
Encaisser
\'
, false)">Encaisser</button>'
;
}
else
if
(
envelop
.
archive
&&
envelop
.
canceled
)
{
}
else
if
(
envelop
.
archive
&&
envelop
.
canceled
)
{
new_html
+=
'<button class="accordion w100">'
+
envelop_name
+
' - <i>'
+
total_amount
+
'€
</i> (Enveloppe supprimée)
</button>'
;
new_html
+=
'<button class="accordion w100">'
+
envelop_name
+
' - <i>'
+
total_amount
+
'€
(Enveloppe supprimée) </i>
</button>'
;
}
else
{
}
else
{
new_html
+=
'<button class="accordion w100">'
+
envelop_name
+
' - <i>'
+
total_amount
+
'€</i></button>'
;
new_html
+=
'<button class="accordion w100">'
+
envelop_name
+
' - <i>'
+
total_amount
+
'€</i></button>'
;
}
}
...
@@ -112,7 +112,7 @@ function set_envelop_dom(envelop, envelop_name, envelop_content_id, envelop_inde
...
@@ -112,7 +112,7 @@ function set_envelop_dom(envelop, envelop_name, envelop_content_id, envelop_inde
var
content
=
envelop
.
envelop_content
[
node
].
partner_name
+
' : '
+
envelop
.
envelop_content
[
node
].
amount
+
'€'
;
var
content
=
envelop
.
envelop_content
[
node
].
partner_name
+
' : '
+
envelop
.
envelop_content
[
node
].
amount
+
'€'
;
if
(
'payment_id'
in
envelop
.
envelop_content
[
node
])
{
if
(
'payment_id'
in
envelop
.
envelop_content
[
node
])
{
content
+=
" -
déjà
comptabilisé."
;
content
+=
" -
- paiement
comptabilisé."
;
}
}
var
textnode
=
document
.
createTextNode
(
content
);
// Create a text node
var
textnode
=
document
.
createTextNode
(
content
);
// Create a text node
...
@@ -123,7 +123,7 @@ function set_envelop_dom(envelop, envelop_name, envelop_content_id, envelop_inde
...
@@ -123,7 +123,7 @@ function set_envelop_dom(envelop, envelop_name, envelop_content_id, envelop_inde
let
envelop_panel
=
$
(
`.panel_
${
envelop_content_id
}
`
);
let
envelop_panel
=
$
(
`.panel_
${
envelop_content_id
}
`
);
if
(
envelop
.
comments
)
envelop_panel
.
append
(
`<p
> Commentaire :
${
envelop
.
comments
}
</p>`
);
if
(
envelop
.
comments
)
envelop_panel
.
append
(
`<p
class="envelop_comment"> <b>Commentaire :</b>
${
envelop
.
comments
}
</p>`
);
if
(
!
envelop
.
archive
)
{
if
(
!
envelop
.
archive
)
{
let
envelop_panel
=
$
(
`.panel_
${
envelop_content_id
}
`
);
let
envelop_panel
=
$
(
`.panel_
${
envelop_content_id
}
`
);
...
...
templates/envelops/index.html
View file @
59969abd
...
@@ -40,12 +40,14 @@
...
@@ -40,12 +40,14 @@
</div>
</div>
</section>
</section>
<section
id=
"archive_cash"
>
<section
id=
"archive_cash"
>
<hr>
<h2
class=
"txtcenter"
>
Enveloppes de liquide archivées
</h2>
<h2
class=
"txtcenter"
>
Enveloppes de liquide archivées
</h2>
<div
id=
"archive_cash_envelops"
class=
"flex-container flex-column-reverse"
>
<div
id=
"archive_cash_envelops"
class=
"flex-container flex-column-reverse"
>
</div>
</div>
</section>
</section>
<section
id=
"archive_ch"
>
<section
id=
"archive_ch"
>
<hr>
<h2
class=
"txtcenter"
>
Enveloppes de chèques archivées
</h2>
<h2
class=
"txtcenter"
>
Enveloppes de chèques archivées
</h2>
<div
id=
"archive_ch_envelops"
class=
"flex-container flex-column-reverse"
>
<div
id=
"archive_ch_envelops"
class=
"flex-container flex-column-reverse"
>
...
...
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