25/09/2024 - 15h

master
cherif 2024-09-25 15:43:45 +02:00
parent 39e6be33f8
commit 0782f46d86
4 changed files with 3000 additions and 11 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="19/09/2024 - 20h">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="23/09/2024 - 17h">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Log/log_file.log" beforeDir="false" afterPath="$PROJECT_DIR$/Log/log_file.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/base_partner_catalog_config.py" beforeDir="false" afterPath="$PROJECT_DIR$/base_partner_catalog_config.py" afterDir="false" />
@ -75,13 +75,6 @@
<option name="presentableId" value="Default" />
<updated>1680804787304</updated>
</task>
<task id="LOCAL-00350" summary="13/07/2024 - 22h">
<created>1720900252716</created>
<option name="number" value="00350" />
<option name="presentableId" value="LOCAL-00350" />
<option name="project" value="LOCAL" />
<updated>1720900252717</updated>
</task>
<task id="LOCAL-00351" summary="14/07/2024 - 22h">
<created>1720990126140</created>
<option name="number" value="00351" />
@ -418,7 +411,14 @@
<option name="project" value="LOCAL" />
<updated>1726770477810</updated>
</task>
<option name="localTasksCounter" value="399" />
<task id="LOCAL-00399" summary="23/09/2024 - 17h">
<created>1727105920855</created>
<option name="number" value="00399" />
<option name="presentableId" value="LOCAL-00399" />
<option name="project" value="LOCAL" />
<updated>1727105920856</updated>
</task>
<option name="localTasksCounter" value="400" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -460,7 +460,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="18/08/2024 - 16h55" />
<MESSAGE value="18/08/2024 - 21h55" />
<MESSAGE value="20/08/2024 - 13h55" />
<MESSAGE value="20/08/2024 - 21h55" />
@ -485,6 +484,7 @@
<MESSAGE value="15/09/2024 - 18:00" />
<MESSAGE value="18/09/2024 - 21h" />
<MESSAGE value="19/09/2024 - 20h" />
<option name="LAST_COMMIT_MESSAGE" value="19/09/2024 - 20h" />
<MESSAGE value="23/09/2024 - 17h" />
<option name="LAST_COMMIT_MESSAGE" value="23/09/2024 - 17h" />
</component>
</project>

File diff suppressed because it is too large Load Diff

View File

@ -113,6 +113,7 @@ def Add_Update_Partner_Catalog_Pub_Config(diction):
'indicateur_2_txt', 'indicateur_2_taille', 'indicateur_2_color', 'indicateur_2_gras',
'indicateur_3_txt', 'indicateur_3_taille', 'indicateur_3_color', 'indicateur_3_gras',
'indicateur_4_txt', 'indicateur_4_taille', 'indicateur_4_color', 'indicateur_4_gras',
'cgv_pdf', 'cgu_pdf'
]
incom_keys = diction.keys()

View File

@ -6386,6 +6386,15 @@ def Get_Partner_Data_From_Subdomain(diction):
config_partner_catalog_data = MYSY_GV.dbname['config_partner_catalog'].find_one({'valide':'1', 'locked':'0',
'partner_owner_recid':str(retval['recid'])})
user['catalog_pub_cgv_pdf'] = ""
if (config_partner_catalog_data and "cgv_pdf" in config_partner_catalog_data.keys()):
user['catalog_pub_cgv_pdf'] = config_partner_catalog_data['cgv_pdf']
user['catalog_pub_cgu_pdf'] = ""
if (config_partner_catalog_data and "cgu_pdf" in config_partner_catalog_data.keys()):
user['catalog_pub_cgu_pdf'] = config_partner_catalog_data['cgu_pdf']
user['catalog_pub_logo'] = ""
if( config_partner_catalog_data and "logo" in config_partner_catalog_data.keys() ):
user['catalog_pub_logo'] = config_partner_catalog_data['logo']