dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,328 Commits 9 Branches 19 Tags
export_excel
Commit Graph

2442 Commits

Author SHA1 Message Date
Fabio Chelly
a1555c3fc8 Merge remote-tracking branch 'origin/development' into development 2013-09-23 11:24:26 +02:00
Fabio Chelly
31697fde3c [-] MO productcomments: confirmation message takes moderation mode into account 2013-09-23 11:24:14 +02:00
Jerome Nadaud
cf82157d47 // oops 2013-09-23 10:48:56 +02:00
Jerome Nadaud
32a7a28567 [-] MO : FixBug #PNM-1683 - Treeview problem 2013-09-23 10:42:10 +02:00
Fabio Chelly
4f639329e9 Merge remote-tracking branch 'origin/development' into development 2013-09-20 10:47:17 +02:00
Fabio Chelly
91ae972655 [-] MO mailalert : products alerts can be registered for multiple guests 
#PNM-1669
 2013-09-20 10:46:56 +02:00
Damien Metzger
f8ca06d927 // Better cache depth management for smarty 2013-09-20 10:26:58 +02:00
Francois Gaillard
8c6aaa3c7d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-19 17:31:42 +02:00
Francois Gaillard
63f4743134 [-] MO : PNM-1715 - Bug fix accented chars & ajax-cart 2013-09-19 17:31:35 +02:00
gRoussac
3aec242600 [-] MO : Editorial could not delete image 2013-09-18 16:16:36 +02:00
Julien
08373c0541 [+] Modules : add hookHome 2013-09-14 14:57:00 +02:00
gRoussac
3870388e1c Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop 
Conflicts:
	modules/mailalerts/mailalerts.php
 2013-09-12 10:09:25 +02:00
Gregory Roussac
f0297824d7 Merge pull request #709 from AgenceNetDesign/development 
[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
 2013-09-12 00:56:36 -07:00
Prestaspirit
a37033e478 [-] MO : Fixed a bug when displaying textures 
Corrections links texture image in the blocklayered
 2013-09-12 07:01:55 +02:00
Daniel
614e56283a Update mailalerts.php 
Fixes issue where customization data is not included in new order email.
 2013-09-11 10:49:34 +08:00
unknown
c5afbc75bd [-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691 2013-09-10 12:01:38 +02:00
Nicolas Sorosac
f30a088848 [*] MO : MailAlerts : Add SQL update script for v2.5 2013-09-10 11:01:11 +02:00
Nicolas Sorosac
c4681c1fb1 [*] MO : MailAlerts : multishop/multilang full compatibility 
Customers will receive alerts based on the real context of the moment they subscribed to the alert (sho, theme & language)

SQL update table : `ps_mailalert_customer_oos`
=========================================

ALTER TABLE `ps_mailalert_customer_oos`
ADD `id_lang` INT( 10 ) UNSIGNED NOT NULL ,
DROP PRIMARY KEY ,
ADD PRIMARY KEY ( `id_customer` , `customer_email` , `id_product` , `id_product_attribute` , `id_shop` ) ;
 2013-09-10 10:24:40 +02:00
Gregory Roussac
a383d55421 Merge pull request #707 from sjousse/development 
[-] MO: ShopImporter fix imported prices
 2013-09-09 08:31:15 -07:00
sjousse
00f3045690 fix imported prices 2013-09-09 17:24:27 +02:00
Gregory Roussac
5362f4d426 Merge pull request #699 from sjousse/patch-1 
[*] MO : ShopImporter Optimize image copy in ShopImport module
 2013-09-09 08:11:51 -07:00
Gregory Roussac
9880d152d4 Merge pull request #706 from sjousse/development 
[*] MO : Add some fields to Orders in Import module
 2013-09-09 08:10:12 -07:00
sjousse
990a889b1c Add some fields to Orders in Import module 2013-09-09 17:08:17 +02:00
Fabio Chelly
9377775eca [-] MO productcomments : 
- Module was broken and works now
- A message is displayed to indicate when a comment has been added.
- Error li are correctly indented

#PNM-753
#PNM-1601
#PNM-1660
#PNM-1609
#PNM-1491
#PNM-1311
#PNM-1233
#PNM-1232
#PNM-937
#PNM-775
 2013-09-06 17:54:12 +02:00
Fabio Chelly
663f592306 [-] MO sendtoafriend : a message is displayed whether the e-mail has been sent or not 
#PNM-627
#PNM-1610
#PNM-1616
 2013-09-06 11:40:41 +02:00
gRoussac
a7d619b208 [-] MO : fix bug #PSCFV-9906 again, bad url parsing 2013-09-05 18:39:07 +02:00
sjousse
6b080e1f02 Optimize image copy in ShopImport module 
2 things :
- copy images to new folder structure instead of legacy one since it's a PS 1.5 branch
- don't create all sizes of images at migration, there's an Admin controller for that (Admin > Settings > Images). That's speed up the import and remove duplicate code (less code to support).

+ some cleaning of unused variables
 2013-09-05 18:24:02 +02:00
sjousse
2f6e0e3fae Changed the way to get the home category (get it from Configuration table now) 2013-09-05 10:14:31 +02:00
sjousse
4d68595447 ShopImporter module is now aware of multi-shop 
Imported categories was affected to Root category instead of a Shop's Home category.
I took the first shop home category is by default.
Maybe adding an option to choose the shop where the datas should be imported.
 2013-09-04 18:26:24 +02:00
sjousse
e9d066c981 fix value of date_add 2013-09-04 16:40:12 +02:00
sjousse
56a1449c69 add date_add to categories 2013-09-04 16:32:00 +02:00
gRoussac
63c19ce1a9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-04 15:39:25 +02:00
gRoussac
3ca2c8da95 [-] BO : Fix #PSCFV-9906 could not register search engines keywords 2013-09-04 15:39:02 +02:00
Rémi Gaillard
00c1860d22 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-04 15:08:41 +02:00
Rémi Gaillard
9348768ceb [-] MO: Fix blocklayered sort by quantity #PSCFV-10300 2013-09-04 15:05:55 +02:00
Gregory Roussac
abf5ad195c Merge pull request #676 from dlage/patch-1 
[*] MO : blocknewproducts avoid $newProducts not defined
 2013-09-02 08:58:32 -07:00
Gregory Roussac
b2ccf88296 Merge pull request #663 from sjousse/patch-1 
[-] MO : Shopimporter file_exists does not exists in Validate Class
 2013-09-02 08:21:42 -07:00
gRoussac
477457a44f Merge branch 'patch-1' of https://github.com/gr4devel/PrestaShop into gr4devel-patch-1 2013-09-02 12:03:01 +02:00
gr4devel
6177589cd3 [+] MO : add link to all manufacturer page and the feature to show All Suppliers 2013-09-02 11:57:16 +02:00
gRoussac
a013be8380 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 
Conflicts:
	modules/blockcart/ajax-cart.js
 2013-09-02 10:00:24 +02:00
dlage
5f1e08e7e2 Fix variable context 
Avoid attribution to the variable $newProducts inside the if. It caused the code to potentially misbehave throwing errors of:
"variable $newProducts not defined".
 2013-09-01 22:47:41 +01:00
sagaradonis
9cd73b411d Update ajax-cart.js 
.size() replaced by .length as .size() is outdated
 2013-08-31 19:05:14 +05:30
gr4devel
39c8a8fc2d [+] MO : add the option to show all Manufacturer 
Add the option to show all Manufacturer in blocktopmenu module.
 2013-08-29 21:32:10 +02:00
Jerome Nadaud
40c64b54e2 [+] MO : Mailalerts - Add Total tax paid to order confirmation 2013-08-29 17:13:48 +02:00
Rémi Gaillard
2620242176 // Fix cms_block creation loop on shop addition 2013-08-27 09:52:14 +02:00
sjousse
536bdb550b fix file validation to use PHP native method 2013-08-26 18:23:39 +02:00
Vincent Augagneur
ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Rémi Gaillard
b7a03bdffa // sometimes image was not the cover one for blocklayered 2013-08-26 10:37:59 +02:00
Rémi Gaillard
a23772dfb7 // small change in blockstore logo name 2013-08-26 10:33:25 +02:00
Damien Metzger
eb69498d2c // Missing icon 2013-08-21 15:34:32 +02:00