diff --git a/conf/settings.php b/conf/settings.php index 29cc3d6..c13cc6a 100644 --- a/conf/settings.php +++ b/conf/settings.php @@ -10,7 +10,9 @@ define("SITE_NAME", "La p'tite fourmi - Gestion paniers"); // ONLINE REPO //////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////// -define('ONLINE_REPOSITORY', !($_SERVER["SERVER_NAME"] == "localhost" || $_SERVER["SERVER_NAME"] == "127.0.0.1")); +define('ONLINE_REPOSITORY', !( $_SERVER["SERVER_NAME"] == "localhost" + || $_SERVER["SERVER_NAME"] == "127.0.0.1" + || substr($_SERVER["SERVER_NAME"], 0, 8) == "192.168." )); //////////////////////////////////////////////////////////////////////// // DEBUG & PHP ERROR SETTINGS ////////////////////////////////////////// @@ -43,7 +45,7 @@ if(ONLINE_REPOSITORY) { } else { define('ROOT_DIR_PATH', '/Applications/MAMP/htdocs/paniers/'); - define('PUBLIC_HTML_ADMIN','http://localhost/paniers/public_html_admin/'); + define('PUBLIC_HTML_ADMIN','http://'.$_SERVER["SERVER_NAME"].'/paniers/public_html_admin/'); } //////////////////////////////////////////////////////////////////////// diff --git a/public_html_admin/css/admin.css b/public_html_admin/css/admin.css index baf6c09..bf376f1 100644 --- a/public_html_admin/css/admin.css +++ b/public_html_admin/css/admin.css @@ -1,62 +1,54 @@ div.mainPage { padding: 0; } -.icon { height: 16px; } - -th.icon, -td.icon { width: 24px; } - .center { text-align: center; } .right { text-align: right; } .border-left { border-left: 1px solid #ddd; } .border-right { border-right: 1px solid #ddd; } -tr.subLine > td { - padding-top: 3px !important; - padding-bottom: 3px !important; - border: none !important; +.noselect { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } -span.nb_item_list { - display: block; - float: right; - color: darkgrey; - font-style: italic; -} +span.hl_results { font-weight: bold; } -span.hl_results { - font-weight: bold; -} - -input[type=date].form-control { - padding-right: 3px; -} - -@media (min-width: 1180px) { - .modal-xl { - width: 1120px; - } -} - -/* MAIN NAV BAR */ -div.main-navbar { - margin-bottom: 0; -} - -.iconTobBar { - display: block; - float: left; - width: 30px; - height: 30px; - position: relative; - top: -5px; - left: -5px; - margin-bottom: -15px; +.imgContainer { background-size: contain; background-repeat: no-repeat; background-position: center; } +input[type=date].form-control { padding-right: 3px; } + +select.form-control { padding-left: 8px!important; } + +textarea { padding: 4px!important; } + +.input-group-addon.active { background-color: #5bc0de; } + +div.intl-tel-input { display: block; } + +.ui-autocomplete { z-index: 10000; } + +@media (min-width: 1180px) { .modal-xl { width: 1120px; } } + +/* MAIN NAV BAR */ + +div.main-navbar { margin-bottom: 0; } + +div.main-navbar a.brand img { + height: 46px; + position: relative; + top: -11px; +} + +div.main-navbar button.navbar-toggle { margin-right: 5px; padding: 5px; } + /* SECOND BAR */ div.secondbar { @@ -65,6 +57,12 @@ div.secondbar { margin-bottom: 0; } +div.secondbar button.navbar-toggle { + margin: 5px; + padding: 4px 9px; + border-color: #CCC; +} + div.secondbar a.brand > img { display: inline-block; height: 46px; @@ -81,12 +79,6 @@ div.secondbar a.brand > span { top: -13px; } -div.secondbar form.navbar_filtre { - margin-left: auto!important; -} - -div.secondbar form.navbar-right { padding-right: 0; } - div.secondbar ul.navbar-nav li > a:hover, div.secondbar ul.navbar-nav li.active > a:hover, div.secondbar ul.navbar-nav li.active > a { @@ -94,21 +86,47 @@ div.secondbar ul.navbar-nav li.active > a { color: #3296C8; } -i.btnClearSearch { - cursor: pointer; +div.secondbar form.form-filtre-search { padding-right: 0; } + +div.secondbar form.form-filtre-search i.btnClearSearch { cursor: pointer; } + +div.secondbar form.form-filtre-search span.separator { + display: inline-table; + vertical-align: middle; + width: 0; height: 30px; + margin: 0 5px; + border-left: 1px solid #CCCCCC; } -div.intl-tel-input { display: block; } +div.secondbar form.form-filtre-search button.btnPrint span.txt { display: none; } -.ui-autocomplete { z-index: 10000; } - -.db_ref { - float: right; - position: relative; - top: 28px; - right: -12px; - color: #CCCCCC; - font-style: italic; +@media (max-width: 767px) { + div.main-navbar a.brand img { height: 40px; } + + div.secondbar { min-height: 0; } + div.secondbar a.brand { height: 40px; padding: 10px; } + + div.secondbar div.navbar-filtre-search { border-top: 1px solid #CCCCCC; padding: 0 5px; } + div.secondbar form.form-filtre-search { padding: 5px 0; margin: 0; } + div.secondbar form.form-filtre-search > *:not(:last-child) { padding-bottom: 7px; } + + div.secondbar form.form-filtre-search span.separator { + width: 100%; height: 0px; + margin: 0; + border-left: none; + border-top: 1px solid #CCCCCC; + } + + div.secondbar form.form-filtre-search button.btnPrint { width: 100%; } + div.secondbar form.form-filtre-search button.btnPrint span.txt { display: inline; } + div.secondbar div.input-group.order { + display: table!important; + width: 100%; + border-top: 1px solid #ccc; + padding: 7px 0 0 0; + } + + div.secondbar button.btnPrint { margin: -5px; } } /* LIST */ @@ -165,46 +183,7 @@ table.scrollingTableList td.loader { background-repeat: no-repeat; } -/* FEEDBACKS */ - -span.form-control-feedback { position: absolute; } -div.form-group.has-feedback > span.form-control-feedback { top: 33px; } -div.has-feedback > span.form-control-feedback { top: 9px; } - -.td_btn_action { - width: 20px; - text-align: center; - padding-left: 0!important; - padding-right: 0!important; -} - -.td_btn_action > button { - text-decoration:none!important; - padding-left: 2px; - padding-right: 2px; -} - -.td_btn_action li > a:hover, - -.td_btn_delete > button, .td_btn_delete > a { color: #d9534f; } - -.td_btn_delete > button:hover, .td_btn_delete > a:hover { color: #c9302c; } - -.td_btn_archive > button, .td_btn_archive > a { color: #f0ad4e; } - -.td_btn_archive > button:hover, .td_btn_archive > a:hover { color: #ec971f; } - -.td_btn_unarchive > button, .td_btn_unarchive > a { color: #5bc0de; } - -.td_btn_unarchive > button:hover, .td_btn_unarchive > a:hover { color: #269abc; } - -.imgContainer { - background-size: contain; - background-repeat: no-repeat; - background-position: center; -} - -img.icon { +table.scrollingTableList img.icon { width: 16px; height: 16px; position: relative; @@ -213,160 +192,97 @@ img.icon { margin-right: 2px; } -.input-group-addon.active { background-color: #5bc0de; } - -/* -/* NAV TABS PANEL -/*/ - -.nav-tabs-panel { - border-radius: 5px 5px 0 0; - border-bottom: none; - color: #fff; - background-color: #3296c8; - padding-top: 5px; - padding-left: 5px; -} -.nav-tabs-panel>li>a { - color: white; - padding-top: 5px; - padding-bottom: 5px; -} - -.nav-tabs-panel>li>a:hover { - color: #2a6496; -} - -.tab-content-panel { - padding: 10px; - border: 1px solid #ddd; - border-radius: 0 0 5px 5px; -} - -/* END NAV TABS PANEL */ - -.center { +.td_btn_action { + width: 30px; text-align: center; + padding-left: 0!important; + padding-right: 0!important; +} +.td_btn_action > button { + text-decoration:none!important; + padding-left: 2px; + padding-right: 2px; +} +.td_btn_action li > a:hover, .td_btn_delete > button, .td_btn_delete > a { color: #d9534f; } +.td_btn_delete > button:hover, .td_btn_delete > a:hover { color: #c9302c; } +.td_btn_archive > button, .td_btn_archive > a { color: #f0ad4e; } +.td_btn_archive > button:hover, .td_btn_archive > a:hover { color: #ec971f; } +.td_btn_unarchive > button, .td_btn_unarchive > a { color: #5bc0de; } +.td_btn_unarchive > button:hover, .td_btn_unarchive > a:hover { color: #269abc; } + +@media only screen and (hover: none) and (pointer: coarse){ + table.scrollingTableList:not(.no-scroll) thead { width: 100%!important; } } -.align_right { - text-align: right; -} +/* MODALS */ -.unitCell { - padding-left: 0 !important; - width:16px; -} - -img.icon { - width: 20px; -} - -.noselect { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - -textarea { - padding: 4px!important; -} - -select.form-control { - padding-left: 8px!important; -} - -thead.fixedHead > tr > td { - height:0; - padding:0; - border:none; -} - -thead.fixedHead > tr > th { - border-width: 0!important; -} - -tr.editDisabled > td, -th.editDisabled, -td.editDisabled { - color: #7c7c7c; -} - -.img-thumbnail { - min-width: 30px; - min-height: 30px; - - background-size: contain; +div.modaLoader { + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; + background-color: rgba(64, 64, 64, 0.3); + background-image: url(../img/wait.svg); background-repeat: no-repeat; + background-size: contain; background-position: center; + z-index: 2000; + display: none; +} +div.modaLoader.show { display: block; } + +div.modal-header > h2.modal-title > img { height: 50px; margin-right: 5px; } + +div.modal-header > .db_ref { + float: right; + position: relative; + top: 28px; + right: -12px; + color: #CCCCCC; + font-style: italic; } -/* -/* EdiTable -/*/ +table.modal-body { margin-bottom: 0; } +table.modal-body tr:last-child { border-bottom-left-radius: 6px; border-bottom-right-radius: 6px; } +table.modal-body tr:last-child td:first-child { border-bottom-left-radius: 6px; !important } +table.modal-body tr:last-child th:first-child { border-bottom-left-radius: 6px; !important } +table.modal-body tr:last-child td:last-child { border-bottom-right-radius: 6px; !important } -td.ediTable, -td.editable { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; +@media (max-width: 767px) { + div.modal-header, div.modal-footer { padding: 10px; } + div.modal-header > h2.modal-title { font-size: 22px; } + div.modal-header > h2.modal-title > img { height: 35px; } + div.modal-header > .db_ref { top: 22px; } - white-space: nowrap; - overflow: hidden; - -o-text-overflow: ellipsis; - text-overflow: ellipsis; + .modal-body { font-size: 12px; } } -td.ediTabling { - padding: 4px!important; +/* INLINE SELECT MANAGER */ + +div.inlineSelectManager .form-control { height: 35px;} +div.inlineSelectManager span.input-group-btn { border: none; } +div.inlineSelectManager span.input-group-btn button { height: 35px;} +div.inlineSelectManager .btnSecondAction { border-radius: 0; border-left: none; } + +/* FORM TABS */ + +div.formTabs div.tab:not(.active) { display: none; } +div.formTabs div.tab { overflow-y: scroll; } +div.formTabs table.modal-body tr:first-child th, +div.formTabs table.modal-body tr:first-child td { border-top: none; } + +@media (max-width: 767px) { + ul.formTabsBtns > li > a { padding: 10px; } } -input.ediTable { - width: 100%; -} +/* FEEDBACKS */ -select.ediTable { - display: block; - width: 100%; - height: 30px; - padding: 6px 12px; - font-size: 14px; - line-height: 1.42857143; - color: #555; - background-color: #fff; - background-image: none; - border: 1px solid #ccc; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s; - -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; -} +span.form-control-feedback { position: absolute; } +div.form-group.has-feedback > span.form-control-feedback { top: 33px; } +div.has-feedback > span.form-control-feedback { top: 9px; } -/* -/* NEW FILE -/*/ - -.new_file_name { - color: grey; - font-size: 0.8em; - font-style: italic; -} - -.new_file_error { - color: red; -} - -#new_doc { - display: none; -} +/* CUSTOM COLOR */ /* Panel */ @@ -393,9 +309,7 @@ select.ediTable { border-color: #357ebd; } -.btn-custom >a{ - color: #fff; -} +.btn-custom > a { color: #fff; } .btn-custom:hover, .btn-custom:focus, @@ -406,171 +320,15 @@ select.ediTable { background-color: #4687bf; border-color: #285e8e; } -.btn-custom:active, -.btn-custom.active, -.open .dropdown-toggle.btn-custom { - background-image: none; -} -.btn-custom.disabled, -.btn-custom[disabled], -fieldset[disabled] .btn-custom, -.btn-custom.disabled:hover, -.btn-custom[disabled]:hover, -fieldset[disabled] .btn-custom:hover, -.btn-custom.disabled:focus, -.btn-custom[disabled]:focus, -fieldset[disabled] .btn-custom:focus, -.btn-custom.disabled:active, -.btn-custom[disabled]:active, -fieldset[disabled] .btn-custom:active, -.btn-custom.disabled.active, -.btn-custom[disabled].active, -fieldset[disabled] .btn-custom.active { - background-color: #3296c8; - border-color: #357ebd; -} -.btn-custom .badge { - color: #3296c8; - background-color: #fff; -} +.btn-custom:active, .btn-custom.active, +.open .dropdown-toggle.btn-custom { background-image: none; } -/* MODAL VIEW */ - -div.modalView .modal-title > img.photo { - border: 1px solid #3296c8; - border-radius: 3px; - padding: 6px; - float: left; - height: 70px; -} - -div.modalView .modal-title div.title { - line-height: 20px; - padding-top: 25px; -} - -div.modalView .modal-title span.title { - display: inline-block; - margin-left: 10px; -} - -div.modalView .modal-title span.name { - font-size: 0.8em; - color: #3296c8; -} - -div.modalView .modal-title span.subline { - display: inline-block; - font-size: 0.5em; - color: #777; - margin-left: 10px; - line-height: 15px; -} - -div.modalView .modal-title span.subline > span.birthday { - font-weight: 300; -} - -div.modaLoader { - position: absolute; - top: 0; - left: 0; - height: 100%; - width: 100%; - background-color: rgba(64, 64, 64, 0.3); - background-image: url(../img/wait.svg); - background-repeat: no-repeat; - background-size: contain; - background-position: center; - z-index: 2000; - display: none; -} -div.modaLoader.show { display: block; } - -table.modal-body { margin-bottom: 0; } -table.modal-body tr:last-child { - border-bottom-left-radius: 6px; - border-bottom-right-radius: 6px; -} -table.modal-body tr:last-child td:first-child { border-bottom-left-radius: 6px; !important } -table.modal-body tr:last-child th:first-child { border-bottom-left-radius: 6px; !important } -table.modal-body tr:last-child td:last-child { border-bottom-right-radius: 6px; !important } - -/* INLINE SELECT MANAGER */ - -.btnSecondAction { - border-radius: 0; - border-left: none; -} - -/* FORM TABS */ - -div.formTabs div.tab:not(.active) { display: none; } - -div.formTabs div.tab { overflow-y: scroll; } - -div.formTabs table.modal-body tr:first-child th, -div.formTabs table.modal-body tr:first-child td { border-top: none; } - -/* PANIER FORM */ - -.formPanier .btnGroupeSecondAction { - border-radius: 0; - border-left: none; -} - -.formPanier div.input-group select.form-control, -.formPanier div.input-group input.form-control, -.formPanier div.input-group span.input-group-btn { - box-sizing: border-box; - height: 35px; -} - -/* CONTRAT FORM */ - -.formContrat div.custom_type { margin-top: -10px; } - -.formContrat .btnLieuSecondAction, -.formContrat .btnContratTypeSecondAction { - border-radius: 0; - border-left: none; -} - -.formContrat div.input-group select.form-control, -.formContrat div.input-group input.form-control, -.formContrat div.input-group span.input-group-btn { - box-sizing: border-box; - height: 35px; -} - -/* MODAL VIEW LEGUME */ - -.has-next-tarif { background-color: #e5ffe7; } - -#modalViewLegume tr.tarifs_titre { background-color: #f2f2f2; border-top: 3px solid #ddd; } -#modalViewLegume tr.tarifs_titre th.groupe { border-left: 1px solid #999999; border-right: 1px solid #999999; } -#modalViewLegume tr.tarif td { border-top: 1px solid #999999; } -#modalViewLegume tr.tarif:not(:last-child) td { border-bottom: 1px solid #999999; } -#modalViewLegume tr.tarif td:not(:first-child) { border-left: 1px solid #999999; } -#modalViewLegume tr.tarif td:not(:first-last) { border-right: 1px solid #999999; } - -#modalViewLegume td.tarif { text-align: center; } - -#modalViewLegume td.tarif.next { background-color: #e5ffe7!important; } -#modalViewLegume td.tarif.current { background-color: #bfe2ff;!important; } -#modalViewLegume td.tarif.old { background-color: #f2f2f2!important; } -#modalViewLegume td.tarif.not_apply { background-color: #ccc!important; } - -/* FORM LEGUME */ -.formLegume div.tarif { margin-bottom: 5px; } -.formLegume div.tarifs:last-child { margin-bottom: 0; } - -.formLegume div.input-group.deleted select.form-control, -.formLegume div.input-group.deleted input.form-control, -.formLegume div.input-group.deleted span.input-group-addon { - text-decoration: line-through; - color: #d9534f; -} +.btn-custom.disabled, .btn-custom[disabled], fieldset[disabled] .btn-custom, +.btn-custom.disabled:hover, .btn-custom[disabled]:hover, fieldset[disabled] .btn-custom:hover, +.btn-custom.disabled:focus, .btn-custom[disabled]:focus, fieldset[disabled] .btn-custom:focus, +.btn-custom.disabled:active, .btn-custom[disabled]:active, fieldset[disabled] .btn-custom:active, +.btn-custom.disabled.active, .btn-custom[disabled].active, fieldset[disabled] .btn-custom.active { background-color: #3296c8; border-color: #357ebd; } +.btn-custom .badge { color: #3296c8; background-color: #fff; } /* MODAL ADMIN CONSOLE */ @@ -589,4 +347,3 @@ div.formTabs table.modal-body tr:first-child td { border-top: none; } } #modalAdminConsole div.modal-body > ul > li.mt { margin-top: 10px; } - diff --git a/public_html_admin/css/clients.css b/public_html_admin/css/clients.css index c8dd4b8..36ee18e 100644 --- a/public_html_admin/css/clients.css +++ b/public_html_admin/css/clients.css @@ -6,58 +6,47 @@ #modalViewClient .formClient { margin: -15px; } -/* NAV TABS */ - -.formClient ul.nav.nav-tabs { padding-left: 10px; } - -div.formClientTabs > div.tab { - display: none; - border-bottom-left-radius: 6px; - border-bottom-right-radius: 6px; - overflow-y: scroll; -} - -div.formClientTabs > div.tab.active { display: block; } - -div.formClientTabs > div.tab span.nullChild { display: block; padding: 10px; } - -div.formClientTabs > div.tab span.nullChild { display: block; padding: 10px; } - -/* TAB INFOS */ - -div.formClientTabs > div.tabInfos table tr:first-child > th, -div.formClientTabs > div.tabInfos table tr:first-child > td { border-top: none; } - -div.formClientTabs > div.tabInfos table th { width: 100px; } - -/* TAB CONTRATS */ - -div.formClientTabs > div.tabContrats table { margin-bottom: 0; } - /* TAB ABSENCES */ -div.formClientTabs > div.tabAbsences table { margin-bottom: 0; } +#modalViewClient div.tabAbsences table { margin-bottom: 0; } -div.formClientTabs > div.tabAbsences table td.ref { width: 30px; } +#modalViewClient div.tabAbsences table td.ref { width: 30px; } -div.formClientTabs > div.tabAbsences table td.debut, -div.formClientTabs > div.tabAbsences table td.fin { width: 130px; text-align: center; } +#modalViewClient div.tabAbsences table td.date { text-align: center; padding: 8px 0; } +#modalViewClient div.tabAbsences table td.debut { width: 130px; } +#modalViewClient div.tabAbsences table td.fin { width: 120px; } -div.formClientTabs > div.tabAbsences table tr.editable { background-color: #cce4f9; } +#modalViewClient div.tabAbsences table tr.editable { background-color: #cce4f9; } -div.formClientTabs > div.tabAbsences table tr.editable td.debut, -div.formClientTabs > div.tabAbsences table tr.editable td.fin, -div.formClientTabs > div.tabAbsences table tr.editable td.remarque { padding: 0; } +#modalViewClient div.tabAbsences table tr.editable td.date { padding: 0; text-align: right; } +#modalViewClient div.tabAbsences table tr.editable td.remarque { padding: 0; } -div.formClientTabs > div.tabAbsences table tr.editable input { +#modalViewClient div.tabAbsences table tr.editable input { border: none; padding: 0; width: 100%; height: 24px; margin-top: 6px; + border-radius: 4px; + border: 1px solid #CCC; } -div.formClientTabs > div.tabAbsences table tr.editable input:focus { outline-style: none; } -div.formClientTabs > div.tabAbsences table tr.editable td.debut input, -div.formClientTabs > div.tabAbsences table tr.editable td.fin input { width: 110px; margin-left: 10px; margin-right: 10px; text-align: right; } -div.formClientTabs > div.tabAbsences table tr.editable td.remarque input { padding-left: 8px; font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; font-size: 14px; } +#modalViewClient div.tabAbsences table tr.editable td.date input { + width: 110px; + margin-right: 10px; + text-align: right; +} + +#modalViewClient div.tabAbsences table tr.editable td.remarque input { + padding-left: 8px; + font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 14px; +} + +@media only screen and (hover: none) and (pointer: coarse) { + #modalViewClient div.tabAbsences table td.debut { width: 110px; } + #modalViewClient div.tabAbsences table td.fin { width: 100px; } + #modalViewClient div.tabAbsences table tr.editable td.date input { width: 90px; } + + #modalViewClient div.tabAbsences table .td-btn-action { text-align: right; } +} \ No newline at end of file diff --git a/public_html_admin/css/contrats.css b/public_html_admin/css/contrats.css index 0769037..e8d6d2b 100644 --- a/public_html_admin/css/contrats.css +++ b/public_html_admin/css/contrats.css @@ -1,4 +1,4 @@ -/* MODAL & FORM LIVRAISON */ +/* MODAL VIEW */ #modalViewContrat { overflow: hidden; } @@ -8,31 +8,48 @@ #modalViewContrat div.tabPaniers table { margin-bottom: 0!important; } +/* CONTRAT FORM */ + +.formContrat div.custom_type { margin-top: -10px; } + +@media (max-width: 1000px) { + .formContrat div.custom_type { + display: block; + padding: 6px 6px 1px 6px; + border: 1px solid #CCC; + background-color: #f6f6f6; + border-radius: 4px; + } + .formContrat div.custom_type span.input-group-addon { + float: left; + box-sizing: border-box; + width: 100px; + height: 35px; + padding: 9px; + border-top-left-radius: 4px!important; + border-bottom-left-radius: 4px!important; + margin-bottom: 5px; + border-right: none; + } + .formContrat div.custom_type .form-control { + display: inline-block; + box-sizing: border-box; + height: 35px; + width: calc(100% - 100px); + border-top-right-radius: 4px!important; + border-bottom-right-radius: 4px!important; + margin-bottom: 5px; + } +} + +@media only screen and (hover: none) and (pointer: coarse) { + .formContrat .form-control[type=date] { width: calc(100vw - 52px); } + + .formContrat div.checkbox > label { line-height: 24px; } + .formContrat div.checkbox:not(.last) { margin-bottom: 15px; } +} + /* NAV TABS */ .formContrat ul.nav.nav-tabs { padding-left: 10px; } -div.formContratTabs > div.tab { - display: none; - border-bottom-left-radius: 6px; - border-bottom-right-radius: 6px; - overflow-y: scroll; -} - -div.formContratTabs > div.tab.active { display: block; } - -div.formContratTabs > div.tab span.nullChild { display: block; padding: 10px; } - -div.formContratTabs > div.tab span.nullChild { display: block; padding: 10px; } - -/* TAB INFOS */ - -div.formContratTabs > div.tabInfos table tr:first-child > th, -div.formContratTabs > div.tabInfos table tr:first-child > td { border-top: none; } - -div.formContratTabs > div.tabInfos table { margin-bottom: 0; } -div.formContratTabs > div.tabInfos table th { width: 200px; } - -/* TAB PANIERS */ - -div.formContratTabs > div.tabPaniers table { margin-bottom: 0; } diff --git a/public_html_admin/css/legumes.css b/public_html_admin/css/legumes.css new file mode 100644 index 0000000..862a489 --- /dev/null +++ b/public_html_admin/css/legumes.css @@ -0,0 +1,71 @@ +/* MODAL VIEW LEGUME */ + +.has-next-tarif { background-color: #e5ffe7; } + +#modalViewLegume tr.tarifs_titre { background-color: #f2f2f2; border-top: 3px solid #ddd; } +#modalViewLegume tr.tarifs_titre th.groupe { border-left: 1px solid #999999; border-right: 1px solid #999999; } +#modalViewLegume tr.tarif td { border-top: 1px solid #999999; } +#modalViewLegume tr.tarif:not(:last-child) td { border-bottom: 1px solid #999999; } +#modalViewLegume tr.tarif td:not(:first-child) { border-left: 1px solid #999999; } +#modalViewLegume tr.tarif td:not(:first-last) { border-right: 1px solid #999999; } + +#modalViewLegume td.tarif { text-align: center; } + +#modalViewLegume td.tarif.next { background-color: #e5ffe7!important; } +#modalViewLegume td.tarif.current { background-color: #bfe2ff;!important; } +#modalViewLegume td.tarif.old { background-color: #f2f2f2!important; } +#modalViewLegume td.tarif.not_apply { background-color: #ccc!important; } + +/* MODAL FORM LEGUME */ + +.formLegume div.tarif { margin-bottom: 7px; } +.formLegume div.tarifs div.tarif:last-child { margin-bottom: 0; } + +.formLegume div.input-group.deleted select.form-control, +.formLegume div.input-group.deleted input.form-control, +.formLegume div.input-group.deleted span.input-group-addon { + text-decoration: line-through; + color: #d9534f; +} + +@media (max-width: 1000px) { + .formLegume div.tarif { + display: block; + padding: 6px; + border: 1px solid #CCC; + background-color: #f6f6f6; + border-radius: 4px; + } + .formLegume div.tarif span.input-group-addon { + float: left; + box-sizing: border-box; + width: 80px; + height: 35px; + padding: 9px; + border-top-left-radius: 4px!important; + border-bottom-left-radius: 4px!important; + margin-bottom: 5px; + border-right: none; + } + .formLegume div.tarif .form-control { + display: inline-block; + box-sizing: border-box; + height: 35px; + margin-bottom: 5px; + } + + .formLegume div.tarif .form-control:not([type=date]) { + width: calc(100% - 80px); + border-top-right-radius: 4px!important; + border-bottom-right-radius: 4px!important; + } + .formLegume div.tarif .form-control[type=date] { width: calc(100% - 120px); } + + .formLegume div.tarif .btnDel { box-sizing: border-box; width: 40px; height: 35px; } +} + +@media only screen and (hover: none) and (pointer: coarse) { + .formLegume div.tarif .form-control[type=date] { + width: calc(100vw - 186px) + } +} diff --git a/public_html_admin/css/livraisons.css b/public_html_admin/css/livraisons.css index c0332b4..5a53c8c 100644 --- a/public_html_admin/css/livraisons.css +++ b/public_html_admin/css/livraisons.css @@ -35,6 +35,10 @@ .formLivraison div.formTabs > div.tabGeneral table th { width: 160px; } +@media only screen and (hover: none) and (pointer: coarse) { + .formLivraison div.formTabs > div.tabGeneral input[type=date] { width: calc(100vw - 52px); } +} + /* TABLE PANIER */ .formLivraison table.panier { @@ -48,7 +52,7 @@ .formLivraison table.panier { margin-top: 10px; } .formLivraison table.panier th, -.formLivraison table.panier td { padding: 4px !important; } +.formLivraison table.panier td { padding: 4px; } .formLivraison table.panier tr.absent { background-color: #f3f3f3; color: #8f8f8f; } .formLivraison table.panier tr.absent td.nom { text-decoration: line-through; } @@ -57,7 +61,7 @@ .formLivraison table.panier tr.lieuTitre th { background-color: black; color: white; - font-size: 1.5em; + font-size: 18px; border: none; } .formLivraison table.panier tr.lieuTitre th:last-child { text-align: right; } @@ -69,7 +73,7 @@ .formLivraison table.panier tr.title th { background-color: black; color: white; - font-size: 1.5em; + font-size: 18px; } .formLivraison table.panier th.titre small { font-size: 0.75em; font-weight: 400; font-style: italic; } .formLivraison table.panier th.total { text-align: right; vertical-align: bottom; } @@ -85,23 +89,27 @@ .formLivraison table.panier tr.head > th:first-child { border-left: none; } .formLivraison table.panier tr.head > th:last-child { border-right: none; } -.formLivraison table.panier tr.head > th.nom, -.formLivraison table.panier tr.head > th.frequence { width: 50%; } .formLivraison table.panier tr.head > th.complement, -.formLivraison table.panier tr.head > th.complement_regle { min-width: 100px; } +.formLivraison table.panier tr.head > th.complement_regle { width: 100px; } + .formLivraison table.panier tr.head > th.tarif, .formLivraison table.panier tr.head > th.quantite, -.formLivraison table.panier tr.head > th.montant { text-align: center; min-width: 120px; } +.formLivraison table.panier tr.head > th.montant { text-align: center; width: 120px; } -.formLivraison table.panier tr.head > th.action { text-align: center; min-width: 30px; } +.formLivraison table.panier tr.head > th.status, +.formLivraison table.panier tr.head > th.action { text-align: center; width: 30px; } + +.formLivraison table.panier tr.legume > td.tarif, +.formLivraison table.panier tr.legume > td.montant { text-align: center; } + +.formLivraison table.panier tr.legume > td.quantite { text-align: right; width: 80px; } +.formLivraison .tabLegumes table.panier tr.legume > td.quantite, +#modalViewLivraison .formLivraison table.panier tr.legume td.quantite { text-align: center; } -.formLivraison table.panier tr.legume td.tarif, -.formLivraison table.panier tr.legume td.quantite, -.formLivraison table.panier tr.legume td.montant { text-align: right; } .formLivraison table.panier tr.legume td.unite { width: 40px; } .formLivraison table.panier th.nb_paniers_restants, -.formLivraison table.panier td.nb_paniers_restants { min-width: 160px; text-align: center; } +.formLivraison table.panier td.nb_paniers_restants { width: 120px; text-align: center; } .formLivraison table.panier input.editable { border: none; padding: 0; } .formLivraison table.panier input.editable:focus { outline-style: none; } @@ -113,9 +121,29 @@ .formLivraison table.panier td.editable { cursor: pointer; } +@media (max-width: 767px) { + .formLivraison table.panier tr.lieuTitre th, + .formLivraison table.panier tr.title th { font-size: 14px; } + + .formLivraison table.panier tr.head > th.tarif, + .formLivraison table.panier tr.head > th.quantite, + .formLivraison table.panier tr.head > th.montant { min-width: 65px; } + + .formLivraison table.panier tr.head > th.tarif, + #modalViewLivraison .formLivraison table.panier tr.head > th.quantite, + .formLivraison .tabLegumes table.panier tr.head > th.quantite, + .formLivraison table.panier tr.head > th.montant { width: 70px; } + + .formLivraison table.panier tr.legume td.tarif, + .formLivraison table.panier tr.legume td.quantite, + .formLivraison table.panier tr.legume td.montant { width: 60px; } + + .formLivraison table.panier tr.legume td.unite { width: 25px; } +} + /* TAB PANIERS */ -.formLivraison div.formTabs > div.tabPaniers input[type=checkbox] { cursor: pointer; } +.formLivraison div.formTabs > div.tabPaniers input[type=checkbox] { cursor: pointer; margin-left: 4px; } .formLivraison div.formTabs > div.tabPaniers table.panier tbody div.tooltip { max-width: 170px; } @@ -123,6 +151,12 @@ .formLivraison div.formTabs > div.tabPaniers tr.panier.absent, .formLivraison div.formTabs > div.tabPaniers tr.panier.absent input[type=checkbox] { cursor: not-allowed; } +.formLivraison div.formTabs > div.tabPaniers tr.panier td { line-height: 16px; vertical-align: middle; } + +@media only screen and (hover: none) and (pointer: coarse) { + .formLivraison div.formTabs > div.tabPaniers tr.panier td { line-height: 24px; } +} + /* TAB COMPO */ .formLivraison div.formTabs > div.tabCompo table.panier { margin: 10px 0; } @@ -133,12 +167,18 @@ /* TAB LEGUMES */ .formLivraison div.formTabs > div.tabLegumes table.panier { margin-top: 10px; } -.formLivraison div.formTabs > div.tabLegumes table.panier th.total.montant { font-size: 1.5em; } -.formLivraison div.formTabs > div.tabLegumes table.panier th.total.unite { font-size: 1.5em; } /* BTN PRINT */ -#modalViewLivraison div.btnPrint { margin-right: 10px; } +#modalViewLivraison div.btnPrint { + position: relative; + top: 4px; + right: 10px; +} + +@media only screen and (hover: none) and (pointer: coarse) { + #modalViewLivraison div.btnPrint button { padding: 6px; } +} /* PRINT - DISTRIB */ diff --git a/public_html_admin/js/contrats.js b/public_html_admin/js/contrats.js index 0711020..3a61e54 100644 --- a/public_html_admin/js/contrats.js +++ b/public_html_admin/js/contrats.js @@ -96,10 +96,8 @@ function initViewContrat() { function modalViewContrat_loadDatas(modal, id) { $.post(contratsConf.baseURL, { 'ref' : id, 'action' : 'getDatas' }, function(jsonTxt) { var datas = JSON.parse(jsonTxt); - - modal.find("small.db_ref > span").html(datas.ref); - modal.find("td.type").html(datas.type_nom); + modal.find("small.db_ref > span").html(datas.ref); client = datas.client_prenom+" "+datas.client_nom; if((datas.client_tel!="" && datas.client_tel!=null) || (datas.client_email!="" && datas.client_email!=null)) { @@ -112,27 +110,24 @@ function modalViewContrat_loadDatas(modal, id) { client += ")"; } modal.find("td.client").html(client); - modal.find("td.tel").html((datas.client_tel!="") ? ''+datas.client_tel+'' : '.'); - modal.find("td.email").html((datas.client_email!="") ? ''+datas.client_email+'' : '.'); + + modal.find("td.type").html(datas.type_nom); + modal.find("td.freq").html(datas.frequence_print); modal.find("td.date").html(datas.date_print); - modal.find("td.frequence").html(datas.frequence_print); - modal.find("td.paniers").html(datas.nb_panier + datas.panier_type); - modal.find("td.panier_type").html(datas.panier_type); - modal.find("td.lieu_depot").html(datas.lieu_depot_nom); - modal.find("td.nb_cheque").html(datas.nb_cheque); + if(parseInt(datas.lieu_depot_ref)>0) modal.find("td.lieu_depot").html(datas.lieu_depot_nom); + if(parseInt(datas.nb_cheque)>0) modal.find("td.nb_cheque").html(datas.nb_cheque); nb_panier_livre = datas.nb_paniers_livres + " / " + datas.nb_paniers; if(datas.np_paniers_distrib_avt_saisie>0) { nb_panier_livre += " (dont "+datas.np_paniers_distrib_avt_saisie+" livré"; if(datas.np_paniers_distrib_avt_saisie>1) nb_panier_livre += "s"; - nb_panier_livre += " avant la saisie du contrat)"; + nb_panier_livre += " avant saisie)"; } modal.find("td.nb_panier_livre").html(nb_panier_livre); modal.find("td.nb_panier_restant").html(datas.nb_paniers_restants + " / " + datas.nb_paniers); // COMPLEMENTS - comp = "."; if(datas.complements>0 || datas.complements_regles>0 || datas.complements_dus>0) { comp = number_format(datas.complements, 2)+" €"; if(datas.complements_regles>0) { @@ -140,8 +135,8 @@ function modalViewContrat_loadDatas(modal, id) { comp += " => "+number_format(Math.abs(datas.complements_dus), 2)+((datas.complements_dus >= 0) ? " € à régler" : " € d'avoir"); } else if(datas.complements_dus>0) comp += " => "+number_format(Math.abs(datas.complements_dus), 2)+((datas.complements_dus >= 0) ? " € à régler" : " € d'avoir"); + modal.find("td.complements").html(comp); } - modal.find("td.complements").html(comp); // PANIERS $.post(contratsConf.baseURL, { 'ref' : id, 'action' : 'modalView_getTab', 'tab' : 'paniers' }, function(result) { @@ -158,26 +153,15 @@ function modalViewContrat_clear(modal) { modal.find("small.db_ref > span").html(""); - modal.find("ul.formContratTabs > li").removeClass('active hide'); - modal.find("ul.formContratTabs > li:first-child").addClass('active'); - modal.find("div.formContratTabs > div.tab").removeClass("active"); - modal.find("div.formContratTabs > div.tab:first-child").addClass("active"); - - modal.find("td.nom").html(""); - modal.find("td.tel").html(""); - modal.find("td.email").html(""); - - modal.find("td.date").html(""); - modal.find("td.frequence").html(""); - modal.find("td.nb_panier").html(""); - modal.find("td.panier_type").html(""); - modal.find("td.lieu_depot").html(""); - modal.find("td.nb_cheque").html(""); - - modal.find("td.nb_panier_livre").html(""); - modal.find("td.nb_panier_restant").html(""); - - modal.find("td.complements").html(""); + modal.find("td.client").html("."); + modal.find("td.type").html("."); + modal.find("td.freq").html("."); + modal.find("td.date").html("."); + modal.find("td.lieu_depot").html("."); + modal.find("td.nb_cheque").html("."); + modal.find("td.nb_panier_livre").html("."); + modal.find("td.nb_panier_restant").html("."); + modal.find("td.complements").html("."); modal.find("div.tabPaniers").html(""); } diff --git a/public_html_admin/js/functions.js b/public_html_admin/js/functions.js index 54fb832..feb8d32 100644 --- a/public_html_admin/js/functions.js +++ b/public_html_admin/js/functions.js @@ -828,7 +828,7 @@ function initEdiTable(elem,beforeFct,callbacbFct) { if(cell.hasClass('float')) initFloatInput(ipt); if(cell.hasClass('center')) ipt.addClass('center'); - if(cell.hasClass('align_right')) ipt.addClass('align_right'); + if(cell.hasClass('right')) ipt.addClass('right'); ipt.focus(); }); diff --git a/public_html_admin/js/livraisons.js b/public_html_admin/js/livraisons.js index dcf316d..a8d92c6 100644 --- a/public_html_admin/js/livraisons.js +++ b/public_html_admin/js/livraisons.js @@ -458,10 +458,9 @@ function modalFormLivraison_addPanierTypeCompo(modal, datas) { // HEADER var thead = $(""); var trT = $(""); - trT.append( $("").html(datas.nom+" (x"+datas.nb+")") ); + trT.append( $("").html(datas.nom+" (x"+datas.nb+")") ); trT.append( $("TOTAL :") ); - trT.append( $("0.00") ); - trT.append( $("€") ); + trT.append( $("0.00 €") ); btnCopyCompo = $(""); trT.append( $("").append(btnCopyCompo) ); thead.append(trT); @@ -473,9 +472,9 @@ function modalFormLivraison_addPanierTypeCompo(modal, datas) { var trH = $(""); trH.append( $("légume") ); - trH.append( $("tarif") ); + trH.append( $("tarif") ); trH.append( $("quantité") ); - trH.append( $("montant") ); + trH.append( $("montant") ); btnAddLegume = $(""); trH.append( $("").append(btnAddLegume) ); thead.append(trH); @@ -502,16 +501,14 @@ function modalFormLivraison_addPanierTypeCompoLegume(modal, panier, datas) { /*** CREATE ***/ var trL = $(""); - tdNom = $(""); - tdTarif = $("0.00"); - tdTarifUnit = $("€/kg"); - tdQ = $("0.000"); - tdQunit = $("kg"); - tdMontant = $("0.00"); - tdMunit = $("€"); + tdNom = $(""); + tdTarif = $("0.00 €"); + tdQ = $("0.000"); + tdQunit = $("kg"); + tdMontant = $("0.00 €"); btnDel = $(""); tdAct = $("").append(btnDel); - trL.append(tdNom).append(tdTarif).append(tdTarifUnit).append(tdQ).append(tdQunit).append(tdMontant).append(tdMunit).append(tdAct); + trL.append(tdNom).append(tdTarif).append(tdQ).append(tdQunit).append(tdMontant).append(tdAct); /*** LOAD DATAS ***/ if(datas!=null && typeof(datas)=="object") { @@ -525,15 +522,14 @@ function modalFormLivraison_addPanierTypeCompoLegume(modal, panier, datas) { .attr('tarif_prix', datas.tarif_prix) .attr('tarif_unite', datas.tarif_unite); - tdTarif.html(number_format(datas.tarif_prix,2)); - tdTarifUnit.html("€/"+unite); + tdTarif.html(number_format(datas.tarif_prix,2)+" €/"+unite); tdQ.html(number_format(datas.quantite,3)); tdQ.attr("unite", datas.tarif_unite); tdQunit.html(unite); - tdMontant.html(number_format(datas.tarif_prix * datas.quantite, 2)); + tdMontant.html(number_format(datas.tarif_prix * datas.quantite, 2)+" €"); modalFormLivraison_refreshPanierTypeCompoLegumeTarif(modal, panier, trL); } @@ -605,7 +601,7 @@ function modalFormLivraison_addPanierTypeCompoLegume(modal, panier, datas) { val = $(this).html(); unite = $(this).attr("unite"); if(unite in legumeTarifUnitesAccronymes) { - var ipt = $(""); + var ipt = $(""); $(this).html("").append(ipt); initFloatInput(ipt); ipt.val( parseFloat(val) ); @@ -636,8 +632,7 @@ function modalFormLivraison_loadPanierTypeCompoLegumeTarif(row, tarif_ref, tarif .attr('tarif_prix', tarif_prix) .attr('tarif_unite', tarif_unite); - row.find("td.tarif").html(number_format(tarif_prix,2)).attr("ref", tarif_ref); - row.find("td.tarif_unite").html("€/"+unite); + row.find("td.tarif").html(number_format(tarif_prix,2)+" €/"+unite).attr("ref", tarif_ref); q = row.find("td.quantite").attr('unite', tarif_unite).html(); if(tarif_unite=="kg") row.find("td.quantite").html( number_format(q,3) ); @@ -698,7 +693,7 @@ function modalFormLivraison_copyPanierTypeCompo(modal, panier, btn) { $.fn.updateCompoLegumeMontant = function() { q = parseFloat($(this).find("td.quantite").html()); t = parseFloat($(this).find("td.tarif").html()); - $(this).find("td.montant").html( number_format(q * t, 2) ); + $(this).find("td.montant").html( number_format(q * t, 2)+" €" ); // UPDATE TOTAL panier = $(this).parent().parent(); @@ -709,7 +704,7 @@ $.fn.updateCompoLegumeMontant = function() { function modalFormLivraison_updateMontantTotalPanier(panier) { var total = 0; panier.find("tr.legume td.montant").each(function(n,e) { total += parseFloat($(this).html()); }) - panier.find("th.total.montant").html(number_format(total, 2)); + panier.find("th.total.montant").html(number_format(total, 2)+" €"); modal = $("#"+panier.attr('modal')); if(modal.length>0) modalFormLivraison_updateTotalLegumes(modal); } @@ -745,16 +740,13 @@ function modalFormLivraison_updateTotalLegumes(modal) { for(ref in legumes) { l = legumes[ref]; unite = legumeTarifUnitesAccronymes[l.tarif_unite]; - + number_format(l.quantite,2); trL = $(""); - tdNom = $("").html(l.nom); - tdTarif = $("").html(number_format(l.tarif_prix,2)); - tdTarifUnit = $("").html("€/"+unite); - tdQ = $("").html( l.tarif_unite=="kg" ? number_format(l.quantite, 3) : l.quantite ); - tdQunit = $("").html(unite); - tdMontant = $("").html(number_format((l.quantite * l.tarif_prix),2)); - tdMunit = $("€"); - trL.append(tdNom).append(tdTarif).append(tdTarifUnit).append(tdQ).append(tdQunit).append(tdMontant).append(tdMunit); + tdNom = $("").html(l.nom); + tdTarif = $("").html(number_format(l.tarif_prix,2)+" €/"+unite); + tdQ = $("").html( round_number(l.quantite,3)+" "+unite ); + tdMontant = $("").html(number_format((l.quantite * l.tarif_prix),2)+" €"); + trL.append(tdNom).append(tdTarif).append(tdQ).append(tdMontant); modal.find("table.legumesTotal tbody").append(trL); modal.find("table.legumesTotal tr.nullChild").addClass('hide'); @@ -763,7 +755,7 @@ function modalFormLivraison_updateTotalLegumes(modal) { } /*** MONTANT TOTAL ***/ - modal.find("table.legumesTotal th.total.montant").html(number_format(total, 2)); + modal.find("table.legumesTotal th.total.montant").html(number_format(total, 2)+" €"); } // GET FORM DATAS diff --git a/public_html_admin/legumes.php b/public_html_admin/legumes.php index 0513ade..8038bd4 100644 --- a/public_html_admin/legumes.php +++ b/public_html_admin/legumes.php @@ -5,6 +5,7 @@ $GLOBALS['smarty']->assign('page','legumes'); $GLOBALS['template'] = 'legumes/legumes_list.tpl'; $GLOBALS['smarty']->assign('secondbar','legumes/legumes_secondbar.tpl'); $jsFiles[] = PUBLIC_HTML_ADMIN.'js/legumes.js'; +$cssFiles[] = PUBLIC_HTML_ADMIN.'css/legumes.css'; if($id>0 && $action) { $infos = getLegumeDatas($id); diff --git a/public_html_admin/templates/clients/client_modal_view.tpl b/public_html_admin/templates/clients/client_modal_view.tpl index 1012ae2..4d9ff58 100644 --- a/public_html_admin/templates/clients/client_modal_view.tpl +++ b/public_html_admin/templates/clients/client_modal_view.tpl @@ -4,9 +4,9 @@
- ref: # + ref: #

- + Fiche client

diff --git a/public_html_admin/templates/clients/client_modal_view_absences_tab.tpl b/public_html_admin/templates/clients/client_modal_view_absences_tab.tpl index 830804e..5813144 100644 --- a/public_html_admin/templates/clients/client_modal_view_absences_tab.tpl +++ b/public_html_admin/templates/clients/client_modal_view_absences_tab.tpl @@ -1,18 +1,17 @@ - - + + - - + {foreach from=$infos.absences item=i} - - + + diff --git a/public_html_admin/templates/clients/client_modal_view_contrats_tab.tpl b/public_html_admin/templates/clients/client_modal_view_contrats_tab.tpl index 54f5c7f..a2bb53c 100644 --- a/public_html_admin/templates/clients/client_modal_view_contrats_tab.tpl +++ b/public_html_admin/templates/clients/client_modal_view_contrats_tab.tpl @@ -1,27 +1,27 @@
debutfindebutfin remarque
{$i.debut_print}{$i.fin_print}{$i.debut_print}{$i.fin_print} {$i.remarque}
- - + + - - + + {foreach from=$infos.contrats item=i} - - + + - - + + {foreachelse} diff --git a/public_html_admin/templates/clients/clients_list.tpl b/public_html_admin/templates/clients/clients_list.tpl index a20efc2..772eabe 100644 --- a/public_html_admin/templates/clients/clients_list.tpl +++ b/public_html_admin/templates/clients/clients_list.tpl @@ -50,7 +50,7 @@

- + Ajouter un client

@@ -81,7 +81,7 @@

- + Modifier un client

@@ -107,7 +107,7 @@

- + Supprimer un client

diff --git a/public_html_admin/templates/clients/clients_secondbar.tpl b/public_html_admin/templates/clients/clients_secondbar.tpl index 7f1cc2e..a154d5d 100644 --- a/public_html_admin/templates/clients/clients_secondbar.tpl +++ b/public_html_admin/templates/clients/clients_secondbar.tpl @@ -7,13 +7,25 @@ {$list_limits.max} CLIENT{if $list_limits.max>1}S{/if}
-
- +
+
{if $search!=""}{/if}
+ +
+ ordre : + +
+ +
+
diff --git a/public_html_admin/templates/contrats/contrat_form.tpl b/public_html_admin/templates/contrats/contrat_form.tpl index 5f41d4f..2394533 100644 --- a/public_html_admin/templates/contrats/contrat_form.tpl +++ b/public_html_admin/templates/contrats/contrat_form.tpl @@ -8,17 +8,13 @@
-
+
- + - +
@@ -51,17 +47,13 @@
-
+
- + - +
@@ -75,12 +67,12 @@
-
+
diff --git a/public_html_admin/templates/contrats/contrat_modal_view.tpl b/public_html_admin/templates/contrats/contrat_modal_view.tpl index 9295080..3cf281a 100644 --- a/public_html_admin/templates/contrats/contrat_modal_view.tpl +++ b/public_html_admin/templates/contrats/contrat_modal_view.tpl @@ -4,9 +4,9 @@
- ref: # + ref: #

- + Fiche contrat

@@ -18,13 +18,14 @@
#type#type début fréquence panier livrésrestantlieurestantlieu
{$i.ref}{$i.type_nom}{$i.ref}{$i.type_nom} {$i.date_print} {$i.frequence_print} {$i.panier_type_nom} {$i.nb_paniers_livres} / {$i.nb_paniers}{$i.nb_paniers_restants}{if $i.force_eligible>0} {/if}{$i.lieu_depot_nom}{$i.nb_paniers_restants}{if $i.force_eligible>0} {/if}{$i.lieu_depot_nom}
- + + - - + +
type de contrat :
client :
type de contrat :
frequence :
date de début :
lieu de dépôt :
nb. de chèque :
nb. de panier(s) livré(s) :
nb. de panier(s) restant(s) :
paniers livrés :
paniers restants :
compléments :
diff --git a/public_html_admin/templates/contrats/contrat_modal_view_tab_paniers.tpl b/public_html_admin/templates/contrats/contrat_modal_view_tab_paniers.tpl index 2fddd3f..d267d4a 100644 --- a/public_html_admin/templates/contrats/contrat_modal_view_tab_paniers.tpl +++ b/public_html_admin/templates/contrats/contrat_modal_view_tab_paniers.tpl @@ -3,7 +3,7 @@ date panier - lieu + lieu complement réglé @@ -13,7 +13,7 @@ {$i.livraison_date_print} {$i.panier_type_nom} - {$i.lieu_depot_nom} + {$i.lieu_depot_nom} {$i.complement} {$i.complement_regle} € diff --git a/public_html_admin/templates/contrats/contrats_list.tpl b/public_html_admin/templates/contrats/contrats_list.tpl index d01a9d8..b9c313e 100644 --- a/public_html_admin/templates/contrats/contrats_list.tpl +++ b/public_html_admin/templates/contrats/contrats_list.tpl @@ -85,7 +85,7 @@

- + Ajouter un contrat

@@ -115,7 +115,7 @@

- + Modifier un contrat

@@ -141,7 +141,7 @@

- + Archiver un contrat

@@ -163,7 +163,7 @@

- + Supprimer un contrat

diff --git a/public_html_admin/templates/contrats/contrats_secondbar.tpl b/public_html_admin/templates/contrats/contrats_secondbar.tpl index 791fdcb..df11df8 100644 --- a/public_html_admin/templates/contrats/contrats_secondbar.tpl +++ b/public_html_admin/templates/contrats/contrats_secondbar.tpl @@ -7,8 +7,8 @@ {$list_limits.max} CONTRAT{if $list_limits.max>1}S{/if}
-
-
diff --git a/public_html_admin/templates/legumes/legume_form.tpl b/public_html_admin/templates/legumes/legume_form.tpl index 6f0dccd..111efc3 100644 --- a/public_html_admin/templates/legumes/legume_form.tpl +++ b/public_html_admin/templates/legumes/legume_form.tpl @@ -18,7 +18,7 @@ {/foreach} prix : - + unité : {if $search!=""}{/if}
- + +
+ ordre : + +
+ +
+
+ + + diff --git a/public_html_admin/templates/livraisons/livraison_form.tpl b/public_html_admin/templates/livraisons/livraison_form.tpl index 0ffedb4..8ee2a16 100644 --- a/public_html_admin/templates/livraisons/livraison_form.tpl +++ b/public_html_admin/templates/livraisons/livraison_form.tpl @@ -2,8 +2,8 @@
@@ -59,15 +59,14 @@ - - - + + - - - + + + diff --git a/public_html_admin/templates/livraisons/livraison_form_tab_paniers.tpl b/public_html_admin/templates/livraisons/livraison_form_tab_paniers.tpl index a7cb9c9..0f5a208 100644 --- a/public_html_admin/templates/livraisons/livraison_form_tab_paniers.tpl +++ b/public_html_admin/templates/livraisons/livraison_form_tab_paniers.tpl @@ -2,27 +2,27 @@
TOTAL :0.00€TOTAL :0.00
légumetarifquantitémontanttarifquantitémontant
- - + + - - - - + + + + {foreach from=$lieu.paniers item=pType} - + {foreach from=$pType.paniers item=p} - - - + + + {/foreach} {/foreach} diff --git a/public_html_admin/templates/livraisons/livraison_modal_view.tpl b/public_html_admin/templates/livraisons/livraison_modal_view.tpl index 9a05f8f..2050958 100644 --- a/public_html_admin/templates/livraisons/livraison_modal_view.tpl +++ b/public_html_admin/templates/livraisons/livraison_modal_view.tpl @@ -4,9 +4,9 @@
- ref: # + ref: #

- + Fiche livraison

@@ -27,8 +27,8 @@
diff --git a/public_html_admin/templates/livraisons/livraison_modal_view_tab_compo.tpl b/public_html_admin/templates/livraisons/livraison_modal_view_tab_compo.tpl index 1ce6c13..d04f6b1 100644 --- a/public_html_admin/templates/livraisons/livraison_modal_view_tab_compo.tpl +++ b/public_html_admin/templates/livraisons/livraison_modal_view_tab_compo.tpl @@ -2,28 +2,24 @@
{$lieu.nom}{$lieu.nb_paniers} paniers{$lieu.nom}{$lieu.nb_paniers} paniers
#clientfréquencenb. de paniers restant#clientfréquencepaniers restant
{$pType.type_nom} (x{$pType.paniers|@count}){$pType.type_nom} (x{$pType.paniers|@count})
{$p.client_prenom} {$p.client_nom}{$p.frequence_print}{$p.nb_paniers_restants}{$p.client_prenom} {$p.client_nom}{$p.frequence_print}{$p.nb_paniers_restants}
- - - - + + + - - - + + + {foreach from=$p.legumes item=l} - - - - - - + + + {/foreach} diff --git a/public_html_admin/templates/livraisons/livraison_modal_view_tab_legumes.tpl b/public_html_admin/templates/livraisons/livraison_modal_view_tab_legumes.tpl index e744aba..701ce8f 100644 --- a/public_html_admin/templates/livraisons/livraison_modal_view_tab_legumes.tpl +++ b/public_html_admin/templates/livraisons/livraison_modal_view_tab_legumes.tpl @@ -1,27 +1,23 @@
{$p.nom} (x{$p.nb})TOTAL :{$p.montant|string_format:"%.2f"}€{$p.nom} (x{$p.nb})TOTAL :{$p.montant|string_format:"%.2f"} €
légumetarifquantitémontanttarifquantitémontant
{$l.nom}{$l.tarif_prix|string_format:"%.2f"}€/{$l.tarif_unite_acro}{$l.quantite|string_format:"%.3f"}{$l.tarif_unite_acro}{($l.tarif_prix * $l.quantite)|string_format:"%.2f"}€{$l.tarif_prix|string_format:"%.2f"} €/{$l.tarif_unite_acro}{$l.quantite_print}{($l.tarif_prix * $l.quantite)|string_format:"%.2f"} €
- - - + + - - - + + + {foreach from=$infos.total_legumes.legumes item=l} - - - - - - + + + {foreachelse} diff --git a/public_html_admin/templates/livraisons/livraison_modal_view_tab_paniers.tpl b/public_html_admin/templates/livraisons/livraison_modal_view_tab_paniers.tpl index 46dedd7..6f253e9 100644 --- a/public_html_admin/templates/livraisons/livraison_modal_view_tab_paniers.tpl +++ b/public_html_admin/templates/livraisons/livraison_modal_view_tab_paniers.tpl @@ -7,8 +7,8 @@ - - + + {if $smarty.request.complements==1} @@ -23,8 +23,8 @@ {foreach from=$pType.paniers item=p} - - + + {if $smarty.request.complements==1} diff --git a/public_html_admin/templates/livraisons/livraisons_list.tpl b/public_html_admin/templates/livraisons/livraisons_list.tpl index 608dfa2..7e461b1 100644 --- a/public_html_admin/templates/livraisons/livraisons_list.tpl +++ b/public_html_admin/templates/livraisons/livraisons_list.tpl @@ -52,7 +52,7 @@

- + Ajouter une livraison

@@ -83,7 +83,7 @@

- + Modifier une livraison

@@ -109,7 +109,7 @@

- + Archiver une livraison

@@ -131,7 +131,7 @@

- + Supprimer une livraison

diff --git a/public_html_admin/templates/livraisons/livraisons_secondbar.tpl b/public_html_admin/templates/livraisons/livraisons_secondbar.tpl index fb17345..5de1e37 100644 --- a/public_html_admin/templates/livraisons/livraisons_secondbar.tpl +++ b/public_html_admin/templates/livraisons/livraisons_secondbar.tpl @@ -7,8 +7,8 @@ {$list_limits.max} LIVRAISON{if $list_limits.max>1}S{/if}
-
- +
+
groupe : @@ -21,6 +21,18 @@
+ +
+ ordre : + +
+ +
+
diff --git a/public_html_admin/templates/paniers/panier_form.tpl b/public_html_admin/templates/paniers/panier_form.tpl index 80011ad..189a79f 100644 --- a/public_html_admin/templates/paniers/panier_form.tpl +++ b/public_html_admin/templates/paniers/panier_form.tpl @@ -8,24 +8,20 @@
-
+
- + - +
- + €
diff --git a/public_html_admin/templates/paniers/panier_modal_view.tpl b/public_html_admin/templates/paniers/panier_modal_view.tpl index f6983d1..0cefb33 100644 --- a/public_html_admin/templates/paniers/panier_modal_view.tpl +++ b/public_html_admin/templates/paniers/panier_modal_view.tpl @@ -4,9 +4,9 @@
- ref: # + ref: #

- + Fiche panier

diff --git a/public_html_admin/templates/paniers/paniers_list.tpl b/public_html_admin/templates/paniers/paniers_list.tpl index da9ce6e..25fc616 100644 --- a/public_html_admin/templates/paniers/paniers_list.tpl +++ b/public_html_admin/templates/paniers/paniers_list.tpl @@ -46,7 +46,7 @@

- + Ajouter un type de panier

@@ -77,7 +77,7 @@

- + Modifier un type de panier

@@ -103,7 +103,7 @@

- + Supprimer un type de panier

diff --git a/public_html_admin/templates/paniers/paniers_secondbar.tpl b/public_html_admin/templates/paniers/paniers_secondbar.tpl index e353e19..d23a3c8 100644 --- a/public_html_admin/templates/paniers/paniers_secondbar.tpl +++ b/public_html_admin/templates/paniers/paniers_secondbar.tpl @@ -7,8 +7,8 @@ {$list_limits.max} PANIER{if $list_limits.max>1}S{/if}
-
- +
+
groupe : @@ -20,6 +20,18 @@ {if $search!=""}{/if}
+ +
+ ordre : + +
+ +
+
diff --git a/public_html_admin/templates/structure/top.tpl b/public_html_admin/templates/structure/top.tpl index dd473fb..7cd0c93 100644 --- a/public_html_admin/templates/structure/top.tpl +++ b/public_html_admin/templates/structure/top.tpl @@ -7,7 +7,7 @@ {$site_name} - + diff --git a/public_html_admin/templates/structure/topBar.tpl b/public_html_admin/templates/structure/topBar.tpl index ef38556..c737db1 100644 --- a/public_html_admin/templates/structure/topBar.tpl +++ b/public_html_admin/templates/structure/topBar.tpl @@ -11,7 +11,7 @@ - +
TOTAL :{$infos.total_legumes.montant|string_format:"%.2f"}€TOTAL :{$infos.total_legumes.montant|string_format:"%.2f"} €
légumetarifquantitémontanttarifquantitémontant
{$l.nom}{$l.tarif_prix|string_format:"%.2f"}€/{$l.tarif_unite_acro}{if $l.tarif_unite=="kg"}{$l.quantite|string_format:"%.3f"}{else}{$l.quantite|string_format:"%.d"}{/if}{$l.tarif_unite_acro}{($l.montant)|string_format:"%.2f"}€{$l.tarif_prix|string_format:"%.2f"} €{$l.quantite_print}{($l.montant)|string_format:"%.2f"} €
clientfréquencenb. de paniers restantfréquencepaniers restantcomplement réglé{$p.client_prenom} {$p.client_nom}{if $p.present}{$p.frequence_print}{else}absent{/if}{$p.nb_paniers_restants}{if $p.present}{$p.frequence_print}{else}absent{/if}{$p.nb_paniers_restants}{if $p.complement >0}{$p.complement} €{else}.{/if} {if $p.complement_regle >0}{$p.complement_regle} €{else}.{/if}