diff --git a/public_html_admin/js/contrats.js b/public_html_admin/js/contrats.js index ea9b5be..7190a2e 100644 --- a/public_html_admin/js/contrats.js +++ b/public_html_admin/js/contrats.js @@ -17,6 +17,8 @@ var contratsConf = { // EDIT edit_modalSelector : "#modalEditContrat", edit_btnSelector : ".btnEditContrat", + // COPY + copy_btnSelector : ".btnCopyContrat", // ARCHIVE archive_modalSelector : "#modalArchiveContrat", archive_btnSelector : ".btnArchiveContrat", @@ -64,6 +66,9 @@ $(document).ready( function() { // EDIT modalEditContrat = $(contratsConf.edit_modalSelector); if(modalEditContrat.length>0) initEditContrat(); + + // COPY + if(modalAddContrat.length>0) initCopyContrat(); // ARCHIVE modalArchiveContrat = $(contratsConf.archive_modalSelector); @@ -439,6 +444,19 @@ function initAddContrat() { modalAddContrat.on('hidden.bs.modal', function (e) { modalFormContrat_clear(modalAddContrat); }); } +/***** COPY *****/ +function initCopyContrat() { + // INIT COPY BTNs + var initBtnFct = function() { modalForm_initBtnCopy( + $(contratsConf.copy_btnSelector), // BTNs + modalAddContrat, // MODAL + modalFormContrat_clear, // CLEAR FUNCTION + modalFormContrat_loadDatas // LOAD DATAS FUNCTION + )}; + registerListProgressLoadCbkFct( $("tbody.progressLoadList"), initBtnFct ); + initBtnFct(); +} + /***** EDIT *****/ function initEditContrat() { // INIT FORM diff --git a/public_html_admin/js/livraisons.js b/public_html_admin/js/livraisons.js index 42e9459..cb0844a 100644 --- a/public_html_admin/js/livraisons.js +++ b/public_html_admin/js/livraisons.js @@ -850,7 +850,7 @@ function initAddLivraison() { modalAddLivraison.on('hidden.bs.modal', function (e) { modalFormLivraison_clear(modalAddLivraison); }); } -/***** COPY ARTICLE *****/ +/***** COPY *****/ function initCopyLivraison() { // INIT COPY BTNs var initBtnFct = function() { modalForm_initBtnCopy( diff --git a/public_html_admin/templates/contrats/contrats_list.tpl b/public_html_admin/templates/contrats/contrats_list.tpl index b9c313e..abbe6b7 100644 --- a/public_html_admin/templates/contrats/contrats_list.tpl +++ b/public_html_admin/templates/contrats/contrats_list.tpl @@ -66,7 +66,7 @@ lieu de dépôt{if $order=="lieu_depot"} {/if} - + {include file='contrats/contrats_list_builder.tpl'} diff --git a/public_html_admin/templates/contrats/contrats_list_builder.tpl b/public_html_admin/templates/contrats/contrats_list_builder.tpl index 3709e4a..a4ea128 100644 --- a/public_html_admin/templates/contrats/contrats_list_builder.tpl +++ b/public_html_admin/templates/contrats/contrats_list_builder.tpl @@ -11,6 +11,7 @@ {$i.nb_paniers_restants}{if $i.force_eligible>0} {/if} {$i.lieu_depot_nom} + {if $i.nb_paniers_livres_absolute>0} {if $i.archive>0} @@ -23,6 +24,6 @@ {foreachelse} - aucun contrat + aucun contrat {/foreach} \ No newline at end of file diff --git a/public_html_admin/templates/livraisons/livraisons_list_builder.tpl b/public_html_admin/templates/livraisons/livraisons_list_builder.tpl index 1492e73..e6ba76d 100644 --- a/public_html_admin/templates/livraisons/livraisons_list_builder.tpl +++ b/public_html_admin/templates/livraisons/livraisons_list_builder.tpl @@ -19,6 +19,6 @@ {foreachelse} - aucune livraison + aucune livraison {/foreach} \ No newline at end of file