TheCoreDev/taome
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correction d'un petit bogue sur les tableaux

Browse Source
This commit is contained in:
TheCoreDev
2021-01-23 04:16:57 +01:00
parent 2f4483720a
commit 300086563c
2 changed files with 43 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
.idea/workspace.xml generated
View File

@@ -17,17 +17,8 @@
</component>
<component name="ChangeListManager">
<list default="true" id="31ff3239-328c-4da3-82da-f4969b3b1658" name="Default Changelist" comment="On continue">
<change afterPath="$PROJECT_DIR$/config/xml/blog-fr.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/xml/trusted_modules_list.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/xml/untrusted_modules_list.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/img/tmp/a2466b96f87e31d0348d59e99cb31ab7.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/img/tmp/a7ebb6ec488410dd2144380d4400898b.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/xml/default_country_modules_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/config/xml/default_country_modules_list.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/xml/modules_native_addons.xml" beforeDir="false" afterPath="$PROJECT_DIR$/config/xml/modules_native_addons.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/xml/must_have_modules_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/config/xml/must_have_modules_list.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/mesCategories/views/css/front.css" beforeDir="false" afterPath="$PROJECT_DIR$/modules/mesCategories/views/css/front.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/themes/classic-child/assets/css/custom.css" beforeDir="false" afterPath="$PROJECT_DIR$/themes/classic-child/assets/css/custom.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/mesCategories/mesCategories.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/mesCategories/mesCategories.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/AdminContainer.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/AdminContainer.php.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/FrontContainer.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/FrontContainer.php" afterDir="false" />
@@ -478,6 +469,15 @@
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="GitSEFilterConfiguration">
<file-type-list>
<filtered-out-file-type name="LOCAL_BRANCH" />
<filtered-out-file-type name="REMOTE_BRANCH" />
<filtered-out-file-type name="TAG" />
<filtered-out-file-type name="COMMIT_BY_MESSAGE" />
</file-type-list>
</component>
<component name="PhpDebugGeneral" listening_started="true" />
<component name="PhpServers">
<servers>
<server host="thecoredev.produit-naturel-france-v2" id="f10ac87d-fec9-4a46-86f2-e88e2c10ded0" name="MAMP" port="8888">
@@ -485,6 +485,7 @@
<mapping local-root="$PROJECT_DIR$/index.php" remote-root="/Volumes/Dev/Sources/Clients/taome/Nouveau_site/www/admin016avdzbx/index.php" />
</path_mappings>
</server>
<server host="thecoredev.produit-naturel-france" id="511f6983-68b5-47fc-9606-ac529c59e906" name="thecoredev.produit-naturel-france" port="8888" />
</servers>
</component>
<component name="ProjectId" id="1iXgLyOML7XTtt5mLoWWOzJ1oW0" />
@@ -499,7 +500,7 @@
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/themes/classic-child/templates/catalog/_partials" />
<property name="node.js.detected.package.eslint" value="true" />
@@ -581,7 +582,9 @@
<workItem from="1605018499932" duration="71000" />
<workItem from="1605019716574" duration="403000" />
<workItem from="1606205012443" duration="699000" />
<workItem from="1606210092453" duration="3279000" />
<workItem from="1606210092453" duration="3538000" />
<workItem from="1611077349970" duration="92000" />
<workItem from="1611370557818" duration="685000" />
</task>
<task id="LOCAL-00001" summary="Initial commit">
<created>1602059851601</created>
@@ -779,7 +782,14 @@
<option name="project" value="LOCAL" />
<updated>1606205596369</updated>
</task>
<option name="localTasksCounter" value="29" />
<task id="LOCAL-00029" summary="Modifs esthétiques pour adaptation aux smartphones">
<created>1606217986213</created>
<option name="number" value="00029" />
<option name="presentableId" value="LOCAL-00029" />
<option name="project" value="LOCAL" />
<updated>1606217986213</updated>
</task>
<option name="localTasksCounter" value="30" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -813,7 +823,6 @@
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="On rajoute encore quelques modules" />
<MESSAGE value="On rajoute les derniers modules et on modifie les CSS" />
<MESSAGE value="Initialisation du module mesCategories" />
<MESSAGE value="On modifie le module mesCategories..." />
@@ -838,127 +847,18 @@
<MESSAGE value="On active le module CustomerRassurance" />
<MESSAGE value="On masque le &quot;Powered by PS&quot; dans le footer des emails" />
<MESSAGE value="Quelques modifs d'images + mise en HTTPS de l'URL d'appel à FontAwesome" />
<option name="LAST_COMMIT_MESSAGE" value="Quelques modifs d'images + mise en HTTPS de l'URL d'appel à FontAwesome" />
<MESSAGE value="Modifs esthétiques pour adaptation aux smartphones" />
<option name="LAST_COMMIT_MESSAGE" value="Modifs esthétiques pour adaptation aux smartphones" />
</component>
<component name="WindowStateProjectService">
<state x="881" y="397" key="#Deployment" timestamp="1606205209568">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="881" y="397" key="#Deployment/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1606205209568" />
<state x="1022" y="562" key="#Notifications" timestamp="1602059783043">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="1022" y="562" key="#Notifications/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602059783043" />
<state x="867" y="405" key="#Servers" timestamp="1603269129063">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="867" y="405" key="#Servers/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603269129063" />
<state x="744" y="393" width="1071" height="724" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1603269276743">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="744" y="393" width="1071" height="724" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603269276743" />
<state x="534" y="230" width="1516" height="953" key="CommitChangelistDialog2" timestamp="1606205787184">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="534" y="230" width="1516" height="953" key="CommitChangelistDialog2/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1606205787184" />
<state x="716" y="290" key="CommitChangelistDialog2/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1602443605649" />
<state x="110" y="123" width="2342" height="1217" key="DiffContextDialog" timestamp="1606211883479">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="110" y="123" width="2342" height="1217" key="DiffContextDialog/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1606211883479" />
<state width="2500" height="354" key="GridCell.Tab.0.bottom" timestamp="1603800751715">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state width="2500" height="354" key="GridCell.Tab.0.bottom/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603800751715" />
<state width="2500" height="354" key="GridCell.Tab.0.bottom/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603555068728" />
<state width="2500" height="354" key="GridCell.Tab.0.center" timestamp="1603800751714">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state width="2500" height="354" key="GridCell.Tab.0.center/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603800751714" />
<state width="2500" height="354" key="GridCell.Tab.0.center/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603555068728" />
<state width="2500" height="354" key="GridCell.Tab.0.left" timestamp="1603800751714">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state width="2500" height="354" key="GridCell.Tab.0.left/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603800751714" />
<state width="2500" height="354" key="GridCell.Tab.0.left/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603555068728" />
<state width="2500" height="354" key="GridCell.Tab.0.right" timestamp="1603800751715">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state width="2500" height="354" key="GridCell.Tab.0.right/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603800751715" />
<state width="2500" height="354" key="GridCell.Tab.0.right/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603555068728" />
<state width="2500" height="354" key="GridCell.Tab.1.bottom" timestamp="1603800751716">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state width="2500" height="354" key="GridCell.Tab.1.bottom/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603800751716" />
<state width="2500" height="354" key="GridCell.Tab.1.bottom/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603555068729" />
<state width="2500" height="354" key="GridCell.Tab.1.center" timestamp="1603800751715">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state width="2500" height="354" key="GridCell.Tab.1.center/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603800751715" />
<state width="2500" height="354" key="GridCell.Tab.1.center/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603555068728" />
<state width="2500" height="354" key="GridCell.Tab.1.left" timestamp="1603800751715">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state width="2500" height="354" key="GridCell.Tab.1.left/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603800751715" />
<state width="2500" height="354" key="GridCell.Tab.1.left/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603555068728" />
<state width="2500" height="354" key="GridCell.Tab.1.right" timestamp="1603800751716">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state width="2500" height="354" key="GridCell.Tab.1.right/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603800751716" />
<state width="2500" height="354" key="GridCell.Tab.1.right/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603555068729" />
<state width="2500" height="354" key="GridCell.Tab.2.bottom" timestamp="1603800751716">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state width="2500" height="354" key="GridCell.Tab.2.bottom/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603800751716" />
<state width="2500" height="354" key="GridCell.Tab.2.bottom/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603555068729" />
<state width="2500" height="354" key="GridCell.Tab.2.center" timestamp="1603800751716">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state width="2500" height="354" key="GridCell.Tab.2.center/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603800751716" />
<state width="2500" height="354" key="GridCell.Tab.2.center/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603555068729" />
<state width="2500" height="354" key="GridCell.Tab.2.left" timestamp="1603800751716">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state width="2500" height="354" key="GridCell.Tab.2.left/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603800751716" />
<state width="2500" height="354" key="GridCell.Tab.2.left/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603555068729" />
<state width="2500" height="354" key="GridCell.Tab.2.right" timestamp="1603800751716">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state width="2500" height="354" key="GridCell.Tab.2.right/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603800751716" />
<state width="2500" height="354" key="GridCell.Tab.2.right/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603555068729" />
<state x="877" y="386" width="838" height="621" key="PhpMappingAdvancedResolveDialog" timestamp="1603269408297">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="877" y="386" width="838" height="621" key="PhpMappingAdvancedResolveDialog/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603269408297" />
<state width="500" height="445" key="SwitcherDM" timestamp="1602591218512">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state width="500" height="445" key="SwitcherDM/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602591218512" />
<state x="880" y="471" key="Vcs.Push.Dialog.v2" timestamp="1606205600815">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="880" y="471" key="Vcs.Push.Dialog.v2/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1606205600815" />
<state x="880" y="471" key="Vcs.Push.Dialog.v2/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1602443610886" />
<state x="1093" y="652" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1604756297485">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="1093" y="652" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1604756297485" />
<state x="493" y="165" width="1539" height="1035" key="find.popup" timestamp="1606217119729">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="493" y="165" width="1539" height="1035" key="find.popup/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1606217119729" />
<state x="712" y="271" width="1324" height="934" key="find.popup/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603537441558" />
<state x="1188" y="469" width="439" height="638" key="ftp.server.browser" timestamp="1606205208246">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="1188" y="469" width="439" height="638" key="ftp.server.browser/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1606205208246" />
<state x="1048" y="586" width="846" height="259" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1602059416468">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="1048" y="586" width="846" height="259" key="git4idea.remote.GitConfigureRemotesDialog/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602059416468" />
<state x="945" y="348" width="670" height="676" key="search.everywhere.popup" timestamp="1603271021969">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="945" y="348" width="670" height="676" key="search.everywhere.popup/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603271021969" />
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="php">
<url>file://$PROJECT_DIR$/modules/mesCategories/mesCategories.php</url>
<line>239</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
</project>

16
modules/mesCategories/mesCategories.php
View File

@@ -238,20 +238,20 @@ class MesCategories extends Module
foreach ($categories as $category) {
$array_category = array (
'category_id' => $category[id_category],
'category_name' => $category[name],
'category_img' => $category[name]
'category_id' => $category["id_category"],
'category_name' => $category["name"],
'category_img' => $category["name"]
);
if (Category::hasChildren($category[id_category], $lang_id, true)) {
$subcategories = Category::getChildren($category[id_category], $lang_id, true, true);
if (Category::hasChildren($category["id_category"], $lang_id, true)) {
$subcategories = Category::getChildren($category["id_category"], $lang_id, true, true);
$array_subcategories = array();
foreach ($subcategories as $subcategory) {
$array_subcategory = array(
'subcategory_name' => $subcategory[name],
'subcategory_id' => $subcategory[id_category],
'subcategory_link' => $subcategory[link_rewrite]);
'subcategory_name' => $subcategory["name"],
'subcategory_id' => $subcategory["id_category"],
'subcategory_link' => $subcategory["link_rewrite"]);
array_push($array_subcategories, $array_subcategory);
}
$array_category['subcategories'] = $array_subcategories;