root/THANASOFT-HFC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'features/feature-client-column-name' into features/feature-hytha-35-devis-5-days

Browse Source
This commit is contained in:
Tiavina 2025-01-23 10:34:48 +03:00
commit dc59f5886e
11 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/js/calendar-main.js
View File

@ -9909,7 +9909,10 @@ __webpack_require__.r(__webpack_exports__);
let values = [];
results.forEach(result => {
let inputValue = (0,html_entities__WEBPACK_IMPORTED_MODULE_5__.decode)(result.id);
let inputLabel = (0,html_entities__WEBPACK_IMPORTED_MODULE_5__.decode)(result.nom);
let prenomValue = result.prenom;
prenomValue = prenomValue === "" || prenomValue === "-" ? "" : prenomValue;
let fullNameValue = result.nom + " " + prenomValue;
let inputLabel = (0,html_entities__WEBPACK_IMPORTED_MODULE_5__.decode)(fullNameValue);
values.push({
value: inputValue.toString(),
label: inputLabel
@ -310270,4 +310273,4 @@ appointmentsConfigsStore.addInitialConfigs((0,_nextcloud_initial_state__WEBPACK_
/******/ })()
;
//# sourceMappingURL=calendar-main.js.map?v=2146a4228da0323e0f03
//# sourceMappingURL=calendar-main.js.map?v=0dc4fd2a55b47dd8acd1

2
calendar/js/calendar-main.js.map
View File

File diff suppressed because one or more lines are too long

4
calendar/js/calendar-reference.js
View File

@ -8865,7 +8865,7 @@ window._registerCustomPickerElement = _;
/******/ // This function allow to reference async chunks
/******/ __webpack_require__.u = (chunkId) => {
/******/ // return url for filenames based on template
/******/ return "calendar-" + chunkId + ".js?v=" + {"vendors-node_modules_vue_dist_vue_runtime_esm_js":"7e3171593bdc0f62040b","vendors-node_modules_nextcloud_capabilities_dist_index_js-node_modules_nextcloud_vue-select_d-877981":"31a7d4ece3cdde2d67f1","vendors-node_modules_nextcloud_cdav-library_dist_dist_js-node_modules_nextcloud_logger_dist_i-36c16b":"c3b3db23da041c717fc1","vendors-node_modules_vue-material-design-icons_CalendarBlank_vue-node_modules_vue-material-de-e2c1f8":"1ec24b5ef07652c6dd39","vendors-node_modules_vue-material-design-icons_CalendarBlankOutline_vue-node_modules_nextclou-4adead":"702892edfb255629754c","vendors-node_modules_autosize_dist_autosize_esm_js-node_modules_html-entities_lib_index_js-no-4072c5":"7212b31e059bc10c256e","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"7cf71b4f92d5bbc180b4","src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258":"740a2859d1f364b508c1","src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254":"b772f2fa794015e69dde","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","src_store_index_js":"e380346f21f6daf64ba8","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"7ec0cf6b65f5c745fa03","node_modules_nextcloud_dialogs_dist_legacy_mjs":"8be838e4c6e9aae56c87","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-8ibBgPg__mjs":"ea54a36450de178d1141","public-calendar-subscription-picker":"2315e24e67ebf6e4b6db","vendors-node_modules_moment_locale_af_js-node_modules_moment_locale_ar-dz_js-node_modules_mom-582c96":"ce1bed825f57dd1d117a","node_modules_moment_locale_sync_recursive_":"4bc2c39c5e0ff182c2e3"}[chunkId] + "";
/******/ return "calendar-" + chunkId + ".js?v=" + {"vendors-node_modules_vue_dist_vue_runtime_esm_js":"7e3171593bdc0f62040b","vendors-node_modules_nextcloud_capabilities_dist_index_js-node_modules_nextcloud_vue-select_d-877981":"31a7d4ece3cdde2d67f1","vendors-node_modules_nextcloud_cdav-library_dist_dist_js-node_modules_nextcloud_logger_dist_i-36c16b":"c3b3db23da041c717fc1","vendors-node_modules_vue-material-design-icons_CalendarBlank_vue-node_modules_vue-material-de-e2c1f8":"1ec24b5ef07652c6dd39","vendors-node_modules_vue-material-design-icons_CalendarBlankOutline_vue-node_modules_nextclou-4adead":"702892edfb255629754c","vendors-node_modules_autosize_dist_autosize_esm_js-node_modules_html-entities_lib_index_js-no-4072c5":"7212b31e059bc10c256e","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"7cf71b4f92d5bbc180b4","src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258":"740a2859d1f364b508c1","src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254":"f59d0f97f0675fd9c321","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","src_store_index_js":"e380346f21f6daf64ba8","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"7ec0cf6b65f5c745fa03","node_modules_nextcloud_dialogs_dist_legacy_mjs":"8be838e4c6e9aae56c87","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-8ibBgPg__mjs":"ea54a36450de178d1141","public-calendar-subscription-picker":"2315e24e67ebf6e4b6db","vendors-node_modules_moment_locale_af_js-node_modules_moment_locale_ar-dz_js-node_modules_mom-582c96":"ce1bed825f57dd1d117a","node_modules_moment_locale_sync_recursive_":"4bc2c39c5e0ff182c2e3"}[chunkId] + "";
/******/ };
/******/ })();
/******/
@ -9115,4 +9115,4 @@ __webpack_require__.p = (0,_nextcloud_router__WEBPACK_IMPORTED_MODULE_1__.linkTo
/******/ })()
;
//# sourceMappingURL=calendar-reference.js.map?v=0c7983efb99a4e95e241
//# sourceMappingURL=calendar-reference.js.map?v=6458b3ad533e25b1d187

2
calendar/js/calendar-reference.js.map
View File

File diff suppressed because one or more lines are too long

7
calendar/js/calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js
View File

@ -6449,7 +6449,10 @@ __webpack_require__.r(__webpack_exports__);
let values = [];
results.forEach(result => {
let inputValue = (0,html_entities__WEBPACK_IMPORTED_MODULE_5__.decode)(result.id);
let inputLabel = (0,html_entities__WEBPACK_IMPORTED_MODULE_5__.decode)(result.nom);
let prenomValue = result.prenom;
prenomValue = prenomValue === "" || prenomValue === "-" ? "" : prenomValue;
let fullNameValue = result.nom + " " + prenomValue;
let inputLabel = (0,html_entities__WEBPACK_IMPORTED_MODULE_5__.decode)(fullNameValue);
values.push({
value: inputValue.toString(),
label: inputLabel
@ -27411,4 +27414,4 @@ module.exports = "data:image/svg+xml,%3csvg%20xmlns=%27http://www.w3.org/2000/sv
/***/ })
}]);
//# sourceMappingURL=calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js.map?v=b772f2fa794015e69dde
//# sourceMappingURL=calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js.map?v=f59d0f97f0675fd9c321

2
calendar/js/calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js.map
View File

File diff suppressed because one or more lines are too long

5
calendar/src/components/Editor/Properties/PropertySelectClient.vue
View File

@ -91,7 +91,10 @@ export default {
let values = []
results.forEach(result => {
let inputValue = decode(result.id)
let inputLabel = decode(result.nom)
let prenomValue = result.prenom
prenomValue = prenomValue === "" || prenomValue === "-" ? "" : prenomValue
let fullNameValue = result.nom + " " + prenomValue
let inputLabel = decode(fullNameValue)
values.push({
value : inputValue.toString(),
label :inputLabel

2
gestion/lib/Service/Devis/Pdf/DevisPdfService.php
View File

@ -137,7 +137,7 @@ class DevisPdfService {
}
private function getDevisPdfFolder(array $devisPdfData,$racinePath){
$clientRacineFolder = $racinePath.'CLIENTS/'.strtoupper($devisPdfData["client_entreprise"]).'/';
$clientRacineFolder = $racinePath.'CLIENTS/'.strtoupper($devisPdfData["client_nom"]).'/';
$defuntsFolder = $clientRacineFolder.'DEFUNTS/'.strtoupper($devisPdfData['defunt_nom']).'/'.'DEVIS'.'/';
$devisDate = $devisPdfData['devis_date'];
$devisDatetime = new DateTime($devisDate);

4
gestion/lib/Service/InvoicePdfHandler.php
View File

@ -77,10 +77,10 @@ class InvoicePdfHandler extends FPDF {
foreach($this->multipleFactureData as $factureData){
$factureType = $factureData["facture_type"];
if($factureType == MultipleFactureTypeConstant::CLIENT_FILTER_TYPE){
$filename = mb_strtoupper($factureData["client_entreprise"],'UTF-8');
$filename = mb_strtoupper($factureData["client_prenom"],'UTF-8');
}
else{
$filename = 'GROUP_'.mb_strtoupper($factureData["client_entreprise"],'UTF-8');
$filename = 'GROUP_'.mb_strtoupper($factureData["client_nom"],'UTF-8');
}
$filename .= $month != 0 ? '_'.DateHelpers::GetMonthPlainString($month) :'';
$filename .= "_".$year;

2
gestion/lib/Service/InvoicePdfService.php
View File

@ -101,7 +101,7 @@ class InvoicePdfService {
}
private function getFacturesFolder(array $factureData,$racinePath){
$clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($factureData["client_entreprise"],'UTF-8').'/';
$clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($factureData["client_nom"],'UTF-8').'/';
$defuntsFolder = $clientRacineFolder.'DEFUNTS/'.mb_strtoupper($factureData['defunt_nom'],'UTF-8').'/'.'FACTURES'.'/';
$devisDate = $factureData['devis_date'];
$devisDatetime = new DateTime($devisDate);

4
gestion/templates/content/index.php
View File

@ -25,9 +25,9 @@
<tr>
<th><?php p($l->t('A exporter'));?></th>
<th><?php p($l->t('ID'));?></th>
<th><?php p($l->t('Code comptable'));?></th>
<th><?php p($l->t('Agence'));?></th>
<th><?php p($l->t('Company'));?></th>
<th><?php p($l->t('First name'));?></th>
<th><?php p($l->t('Last name'));?></th>
<th><?php p($l->t('Legal information'));?></th>
<th><?php p($l->t('Phone number'));?></th>
<th><?php p($l->t('Email'));?></th>