Commit Graph

1620 Commits

Author SHA1 Message Date
8efc96d81d Rajout du module AdminComment + modifs pour que le commentaire (= le n° de bon de commande) figure dans la facture et dans le relevé de facture 2020-11-19 16:22:51 +01:00
66ce4ee218 Inital commit 2020-11-19 15:36:28 +01:00
Manuel Raynaud
71f32f83d3 Merge pull request #590 from bibich/mail
Mail
2014-08-14 11:59:55 +02:00
Manuel Raynaud
4651e6ba6c Merge pull request #593 from griotteau/patch-translate
Missing translation with wrong password
2014-08-14 09:24:21 +02:00
Riotteau
0965a846a5 Missing translation with wrong password 2014-08-13 18:01:47 +02:00
Riotteau
531536ab06 Default country set in customer creation 2014-08-13 14:30:52 +02:00
Julien Chanséaume
d01b04d555 missing semicolon 2014-08-13 12:10:53 +02:00
Julien Chanséaume
8044736f34 fixed ace editor on message edition 2014-08-13 11:54:45 +02:00
Manuel Raynaud
6dbe4f3539 Merge pull request #571 from MrGuillou/patch-1
Multiple ajax call if multiple address
2014-08-08 11:39:44 +02:00
Manuel Raynaud
694b0c9fed Merge pull request #575 from griotteau/patch-template-default
Add document loop in folder/content default template
2014-08-07 16:56:06 +02:00
Riotteau
083e80891f Add document loop in folder/content default template 2014-08-07 15:46:02 +02:00
MrGuillou
93f7099682 Multiple ajax call if multiple address
Add test if input radio is checked on event listener "change"
2014-08-06 12:47:36 +02:00
Manuel Raynaud
f69878b623 Merge pull request #566 from griotteau/patch-reseller
Add the reseller field in the customer form
2014-08-05 16:02:12 +02:00
Manuel Raynaud
bd26e3da9a Merge pull request #568 from lovenunu/fix-archiving
Fix archiving
2014-08-05 15:57:51 +02:00
Benjamin Perche
d1a07b883b Add checks for archive building libraries
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	modifié:         templates/backOffice/default/ajax/export-modal.html
	modifié:         templates/backOffice/default/export-page.html
2014-08-05 15:10:19 +02:00
root
f5318df219 Add the reseller field in the customer form 2014-08-05 11:40:49 +02:00
Benjamin Perche
718ed2ae2d hide category if no export/import and add module category
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Config/Resources/import.xml
	modifié:         templates/backOffice/default/export.html
	modifié:         templates/backOffice/default/import.html
2014-08-05 10:30:57 +02:00
Benjamin Perche
c453981d5a Fix translation domain in modales
modifié:         templates/backOffice/default/ajax/export-modal.html
	modifié:         templates/backOffice/default/ajax/import-modal.html
2014-08-05 10:02:42 +02:00
Benjamin Perche
318341b702 Add translation
modifié:         core/lib/Thelia/Config/I18n/en_US.php
	modifié:         core/lib/Thelia/Config/I18n/fr_FR.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         templates/backOffice/default/I18n/en_US.php
	modifié:         templates/backOffice/default/I18n/fr_FR.php
2014-08-05 09:50:01 +02:00
Benjamin Perche
9967fbdd6c Add import positionning
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         templates/backOffice/default/import.html
2014-08-05 09:25:49 +02:00
Julien Chanseaume
88ec8bc661 fixed rebase conflictssssss 2014-08-04 21:21:57 +02:00
Julien Chanséaume
a3021a0768 Added fallback method to product page when pse use differrents attributes. 2014-08-04 20:31:27 +02:00
Julien Chanséaume
18b3a12771 removed tax when there is no tax 2014-08-04 20:31:27 +02:00
Julien Chanséaume
a50f79a9f4 removed debug values 2014-08-04 20:31:27 +02:00
Julien Chanséaume
034f92ae1a changed smarty variables 2014-08-04 20:30:39 +02:00
Julien Chanséaume
0f35dc123e added translations 2014-08-04 20:30:39 +02:00
Julien Chanséaume
d8873cdf2e added informations on prices on cart 2014-08-04 20:30:39 +02:00
Julien Chanséaume
0610b8037a Better UI for brands 2014-08-04 20:30:39 +02:00
Julien Chanséaume
09c124c6ae optimized templates, UI 2014-08-04 20:30:39 +02:00
Julien Chanséaume
27e0596ca7 added new block to initialize variables 2014-08-04 20:29:48 +02:00
Julien Chanséaume
b8dd60d0ec improved produc detail page, fixed quick view issue 2014-08-04 20:17:25 +02:00
Julien Chanséaume
5ab74a423b modified product form to split attribute. 2014-08-04 20:15:06 +02:00
Julien Chanséaume
c2cb4f79a4 Added fallback for meta description for page category, product, folder, content, brand 2014-08-04 19:42:32 +02:00
Julien Chanseaume
867944f06c fixed issue for product page when there is only 1 PSE 2014-08-04 19:26:22 +02:00
Julien Chanseaume
cab99af210 Added output var to product loop to get the number of PSE for a product 2014-08-04 19:26:22 +02:00
Julien Chanséaume
8c09605e32 temp changes 2014-08-04 19:26:22 +02:00
Julien Chanséaume
160ccaa4ff Moved Terms aggrement from account to order, display terms and conditions 2014-08-04 19:26:22 +02:00
Julien Chanséaume
c243da002a Fixed link on image on search page 2014-08-04 19:26:22 +02:00
Julien Chanséaume
4f8b17bfef Improved pdf template 2014-08-04 19:26:22 +02:00
Julien Chanséaume
953a6300f9 changes on front office template UI 2014-08-04 19:26:22 +02:00
Julien Chanséaume
ca3cdb278c redirect to order when creating or updating address from the order 2014-08-04 19:26:22 +02:00
Julien Chanséaume
d105879fa1 display a message when a combination does not exist 2014-08-04 19:26:22 +02:00
Julien Chanséaume
bd5dd4a172 small fixes on frontoffice 2014-08-04 19:26:22 +02:00
Julien Chanséaume
e76ad60342 Added the combination attibutes on cart popup 2014-08-04 19:26:22 +02:00
Julien Chanséaume
691553060b improved produc detail page, fixed quick view issue 2014-08-04 19:26:22 +02:00
Julien Chanséaume
4e1e082a7c modified product form to split attribute. 2014-08-04 19:26:21 +02:00
Julien Chanséaume
b4d0d085fe optimisation of the frontoffice. Product list is ten times faster. But only the default product sale element can be added to cart. 2014-08-04 19:26:21 +02:00
Julien Chanséaume
1e8e26cb1d Added fallback for meta description for page category, product, folder, content, brand 2014-08-04 19:26:21 +02:00
Julien Chanséaume
9ec204899c Fixed typo 2014-08-04 19:26:21 +02:00
Julien Chanséaume
eaad1afdff Added possibility to change the main product reference 2014-08-04 19:26:21 +02:00