slambert/Thanasoft-Hytha
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fixes/fix-change-article-in-agenda' into staging

Browse Source
This commit is contained in:
Tiavina 2024-12-26 11:42:25 +03:00
commit e35a6da064
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21350,7 +21350,7 @@ var render = function render() {
}), _vm._v(" "), _c("PropertySelectAjaxMultiple", { }), _vm._v(" "), _c("PropertySelectAjaxMultiple", {
staticClass: "property-description", staticClass: "property-description",
attrs: { attrs: {
url: "/apps/gestion/ajaxGetArticles", url: "/apps/gestion/ajaxGetProduits",
"is-read-only": _vm.isReadOnly, "is-read-only": _vm.isReadOnly,
"prop-model": _vm.rfcProps.articles, "prop-model": _vm.rfcProps.articles,
value: _vm.description, value: _vm.description,
@ -309091,4 +309091,4 @@ appointmentsConfigsStore.addInitialConfigs((0,_nextcloud_initial_state__WEBPACK_
/******/ })() /******/ })()
; ;
//# sourceMappingURL=calendar-main.js.map?v=69665488261a4dab61c2 //# sourceMappingURL=calendar-main.js.map?v=f13d11f3371a744c987e

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

File diff suppressed because one or more lines are too long

2
calendar/src/views/EditSidebar.vue
View File

@ -121,7 +121,7 @@
<PropertySelectAjaxMultiple <PropertySelectAjaxMultiple
class="property-description" class="property-description"
url="/apps/gestion/ajaxGetArticles" url="/apps/gestion/ajaxGetProduits"
:is-read-only="isReadOnly" :is-read-only="isReadOnly"
:prop-model="rfcProps.articles" :prop-model="rfcProps.articles"
:value="description" :value="description"

4
gestion/lib/Db/Bdd.php
View File

@ -856,7 +856,7 @@ class Bdd {
public function getArticlesIdFromArticlesNameArray(array $articles): array { public function getArticlesIdFromArticlesNameArray(array $articles): array {
$articleIds = []; $articleIds = [];
foreach ($articles as $article) { foreach ($articles as $article) {
$sql = "SELECT id FROM ".$this->tableprefix."article WHERE description = ?"; $sql = "SELECT id FROM ".$this->tableprefix."produit WHERE description = ?";
$res = $this->execSQLNoJsonReturn($sql, array($article)); $res = $this->execSQLNoJsonReturn($sql, array($article));
if ($res) { if ($res) {
$articleIds[] = $res[0]['id']; $articleIds[] = $res[0]['id'];
@ -876,7 +876,7 @@ class Bdd {
} }
private function insertDevisArticle($devisId,$articleId,$idNextcloud){ private function insertDevisArticle($devisId,$articleId,$idNextcloud){
$sql = "INSERT INTO ".$this->tableprefix."article_devis (devis_id, article_id, quantite, discount, comment,id_nextcloud) VALUES (?, ?, 1, 0, '-',?)"; $sql = "INSERT INTO ".$this->tableprefix."produit_devis (devis_id, produit_id, quantite, discount, comment,id_nextcloud) VALUES (?, ?, 1, 0, '-',?)";
$this->execSQLNoData($sql, array($devisId, $articleId,$idNextcloud)); $this->execSQLNoData($sql, array($devisId, $articleId,$idNextcloud));
return true; return true;
} }

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

@ -104,8 +104,8 @@ class GestionService {
if(!empty($articlesValue)){ if(!empty($articlesValue)){
$articlesId = $this->gestionBdd->getArticlesIdFromArticlesNameArray($articlesValue); $articlesId = $this->gestionBdd->getArticlesIdFromArticlesNameArray($articlesValue);
$this->gestionBdd->insertDevisArticleFromDevisIdAndArticlesIdArray($devisId, $articlesId); $this->gestionBdd->insertDevisArticleFromDevisIdAndArticlesIdArray($devisId, $articlesId);
$this->gestionBdd->createDevisTrajetFromVCalendar($devisId);
} }
$this->gestionBdd->createDevisTrajetFromVCalendar($devisId);
} }
private function GetClientIdFromVCalendarString(string $vCalendarString){ private function GetClientIdFromVCalendarString(string $vCalendarString){