Commit Graph

14083 Commits

Author SHA1 Message Date
Mike Jolley 5e62143767 Update tools text Closes #9512 2015-11-05 14:44:05 +00:00
Mike Jolley af4f775ff0 Minify 2015-11-05 14:37:23 +00:00
Mike Jolley d2aae50a84 Merge pull request #9523 from om4james/duplicatekeyerror
Fix duplicate key errors during db upgrade/install
2015-11-05 12:53:22 +00:00
James Collins 45972cf92b Fix duplicate key errors during db upgrade/install
Running phpunit tests currently outputs the following errors/warnings:

WordPress database error Duplicate key name 'session_id' for query ALTER TABLE wptests_woocommerce_sessions ADD UNIQUE KEY  session_id (session_id) made by PHPUnit_TextUI_Command::main, PHPUnit_TextUI_Command->run, PHPUnit_TextUI_Command->handleArguments, PHPUnit_TextUI_Command->handleBootstrap, PHPUnit_Util_Fileloader::checkAndLoad, PHPUnit_Util_Fileloader::load, include_once('/srv/www/woocommerce/htdocs/wp-content/plugins/woocommerce/tests/bootstrap.php'), WC_Unit_Tests_Bootstrap::instance, WC_Unit_Tests_Bootstrap->__construct, require_once('/srv/www/wordpress-develop/tests/phpunit/includes/bootstrap.php'), require_once('wp-settings.php'), do_action('setup_theme'), call_user_func_array, WC_Unit_Tests_Bootstrap->install_wc, WC_Install::install, WC_Install::create_tables, dbDelta
WordPress database error Multiple primary key defined for query ALTER TABLE wptests_woocommerce_sessions ADD PRIMARY KEY  session_key (session_key) made by PHPUnit_TextUI_Command::main, PHPUnit_TextUI_Command->run, PHPUnit_TextUI_Command->handleArguments, PHPUnit_TextUI_Command->handleBootstrap, PHPUnit_Util_Fileloader::checkAndLoad, PHPUnit_Util_Fileloader::load, include_once('/srv/www/woocommerce/htdocs/wp-content/plugins/woocommerce/tests/bootstrap.php'), WC_Unit_Tests_Bootstrap::instance, WC_Unit_Tests_Bootstrap->__construct, require_once('/srv/www/wordpress-develop/tests/phpunit/includes/bootstrap.php'), require_once('wp-settings.php'), do_action('setup_theme'), call_user_func_array, WC_Unit_Tests_Bootstrap->install_wc, WC_Install::install, WC_Install::create_tables, dbDelta

WordPress database error Duplicate key name 'session_id' for query ALTER TABLE wptests_woocommerce_sessions ADD UNIQUE KEY  session_id (session_id) made by PHPUnit_TextUI_Command::main, PHPUnit_TextUI_Command->run, PHPUnit_TextUI_TestRunner->doRun, PHPUnit_Framework_TestSuite->run, PHPUnit_Framework_TestSuite->run, PHPUnit_Framework_TestCase->run, PHPUnit_Framework_TestResult->run, PHPUnit_Framework_TestCase->runBare, PHPUnit_Framework_TestCase->runTest, ReflectionMethod->invokeArgs, WooCommerce\Tests\Util\WC_Tests_Install->test_check_version, WC_Install::check_version, WC_Install::install, WC_Install::create_tables, dbDelta
WordPress database error Multiple primary key defined for query ALTER TABLE wptests_woocommerce_sessions ADD PRIMARY KEY  session_key (session_key) made by PHPUnit_TextUI_Command::main, PHPUnit_TextUI_Command->run, PHPUnit_TextUI_TestRunner->doRun, PHPUnit_Framework_TestSuite->run, PHPUnit_Framework_TestSuite->run, PHPUnit_Framework_TestCase->run, PHPUnit_Framework_TestResult->run, PHPUnit_Framework_TestCase->runBare, PHPUnit_Framework_TestCase->runTest, ReflectionMethod->invokeArgs, WooCommerce\Tests\Util\WC_Tests_Install->test_check_version, WC_Install::check_version, WC_Install::install, WC_Install::create_tables, dbDelta
.WordPress database error Duplicate key name 'session_id' for query ALTER TABLE wptests_woocommerce_sessions ADD UNIQUE KEY  session_id (session_id) made by PHPUnit_TextUI_Command::main, PHPUnit_TextUI_Command->run, PHPUnit_TextUI_TestRunner->doRun, PHPUnit_Framework_TestSuite->run, PHPUnit_Framework_TestSuite->run, PHPUnit_Framework_TestCase->run, PHPUnit_Framework_TestResult->run, PHPUnit_Framework_TestCase->runBare, PHPUnit_Framework_TestCase->runTest, ReflectionMethod->invokeArgs, WooCommerce\Tests\Util\WC_Tests_Install->test_install, WC_Install::install, WC_Install::create_tables, dbDelta
WordPress database error Multiple primary key defined for query ALTER TABLE wptests_woocommerce_sessions ADD PRIMARY KEY  session_key (session_key) made by PHPUnit_TextUI_Command::main, PHPUnit_TextUI_Command->run, PHPUnit_TextUI_TestRunner->doRun, PHPUnit_Framework_TestSuite->run, PHPUnit_Framework_TestSuite->run, PHPUnit_Framework_TestCase->run, PHPUnit_Framework_TestResult->run, PHPUnit_Framework_TestCase->runBare, PHPUnit_Framework_TestCase->runTest, ReflectionMethod->invokeArgs, WooCommerce\Tests\Util\WC_Tests_Install->test_install, WC_Install::install, WC_Install::create_tables, dbDelta

dbDelta requires very specific syntax (as per http://codex.wordpress.org/Creating_Tables_with_Plugins).
2015-11-05 13:43:56 +08:00
Claudio Sanches 66026ed36c Change old settings icon to Dashicons, closes #9517 2015-11-05 02:05:28 -02:00
Claudio Sanches 607dad6578 Merge pull request #9519 from woothemes/woocommerce
Switches Settings icon to Dashicon Gear
2015-11-05 01:55:51 -02:00
Danny Santoro be2cd1d3ae Switches Settings icon to Dashicon Gear
Re: https://github.com/woothemes/woocommerce/issues/9517
2015-11-04 14:33:01 -05:00
Mike Jolley 12000cd85f Fix model in IOS
Fixes #9507
2015-11-04 15:41:25 +00:00
Mike Jolley 61e746730f wc_transaction_query function
Only uses transactions if enabled, or read uncommitted is supported
#9279
2015-11-04 14:11:40 +00:00
Mike Jolley 48f8665e2d Hide SQL errors during ajax requests
Avoids invalid JSON
2015-11-04 13:35:32 +00:00
Mike Jolley 7eb45ba16f Added wc_array_cartesian function to generate variations in a logical order.
Fixes #9515 @claudiosmweb
2015-11-04 12:14:51 +00:00
Claudio Sanches e1c2054b5c Improved how geolocation js check for pages where shouldn't load
Simplified all checks in just one
Less PHP and JS conditionals

cc @mikejolley
2015-11-04 01:51:54 -02:00
Claudio Sanches 0a9929146d Minifiy 2015-11-04 01:23:45 -02:00
Claudio Sanches fde904b27a [2.4] Fixed redirection loop on customizer screen
It's caused an redirection loop on the customizer page when
activated "Geolocate (with page caching support)" option

cc @mikejolley
2015-11-04 01:20:16 -02:00
Claudio Sanches 58468d8821 [CLI] Fixed sanitization for product attributes 2015-11-03 17:11:54 -02:00
Claudio Sanches e4ba0ae8e9 Merge pull request #9508 from shivapoudel/periodic-ending
Tweak the dockblocks and periodic-ending fix
2015-11-03 16:54:33 -02:00
Shiva Poudel d9e8057df3 Tweak the dockblocks and periodic-ending fix 2015-11-04 00:05:08 +05:45
Claudio Sanches a729f999ac Merge pull request #9506 from shivapoudel/woo-author
I don't think periodic ending is needed here
2015-11-03 15:24:56 -02:00
Shiva Poudel e31dd2a687 I don't think periodic ending is needed here 2015-11-03 22:59:17 +05:45
Mike Jolley 1756aa8fca Use help tip function in email table. 2015-11-03 16:12:13 +00:00
Mike Jolley 1b38f380af Merge remote-tracking branch 'origin/master'
Conflicts:
	includes/emails/class-wc-email.php
2015-11-03 16:09:01 +00:00
Mike Jolley 3b5e51a646 Readme 2015-11-03 16:07:25 +00:00
Mike Jolley 630fe582ed Merge branch 'email-settings-ui' 2015-11-03 16:06:31 +00:00
Claudio Sanches a0d266640a Looks better with single quotes, closes #9493 2015-11-03 13:58:05 -02:00
Claudio Sanches 439141bbe3 Fixed undefined error on WC_Geo_IP 2015-11-03 13:55:26 -02:00
Mike Jolley 1e945026b3 Tweak screen description 2015-11-03 15:41:31 +00:00
Mike Jolley 8457dbb57d Display if emails are manually sent 2015-11-03 15:40:10 +00:00
Mike Jolley d95f863d79 Show descriptions inline 2015-11-03 15:04:29 +00:00
Mike Jolley 52553968c5 Use desc_tip for emails 2015-11-03 14:59:48 +00:00
Mike Jolley 3c6a870335 Email class tidyup 2015-11-03 14:57:39 +00:00
Claudio Sanches c6ab828aa1 [2.4] Improved error handling in WC_Geo_IP
Implemented our log system to register in background any errors

Closes #9501
2015-11-03 12:30:33 -02:00
Claudio Sanches 5893875b0c Removed period for file headers 2015-11-03 11:53:50 -02:00
Claudio Sanches ee30b5b308 Fixed php docs standards 2015-11-03 11:31:20 -02:00
Claudio Sanches efa19f799d Fixed some coding standards for docblocks 2015-11-03 10:28:01 -02:00
Mike Jolley 5f65494e27 Restructure emails admin to avoid listing emails along the top
Moves emails to a table on the settings screen.

Also tweaks some section text and moves descriptions to tooltips for a
less cluttered interface.
2015-11-02 16:27:00 +00:00
Mike Jolley 48b93b937f Added admin order/payment failed notification
Closes #8617
2015-11-02 14:45:24 +00:00
James Koster 1d0f52f6db revert order pay responsive table. #9015
Would require a conditional colspan for handheld. Not worth the
overhead for this small table which should perform adequately already.
2015-11-02 13:59:07 +00:00
James Koster 2b39c78ce8 No need for customer details table to be responsive. #9015
Like several other tables, it’s small enough to degrade gracefully on
handheld devices
2015-11-02 13:59:07 +00:00
James Koster 2b05a493f6 Makes the order payment table responsive. #9015 2015-11-02 13:59:07 +00:00
James Koster 0b5f91c940 General responsive table styling. #9015
Also applied `.shop_table` class to the cart totals table.
2015-11-02 13:59:07 +00:00
James Koster c114489d5b Responsive cart and cart totals tables. #9015 2015-11-02 13:59:07 +00:00
Mike Jolley 9ac43ec4d4 Cleanup 2015-11-02 13:02:23 +00:00
Mike Jolley 798cf9a50b Merge pull request #9485 from helgatheviking/email-ids-on-hooks
pass email object to email templates and template hooks
2015-11-02 13:02:04 +00:00
Mike Jolley 8af4fe15ae Readme 2015-11-02 11:29:14 +00:00
Mike Jolley 7fdb93329c Merge branch 'revised-single-variation-cart-template'
Conflicts:
	includes/admin/views/html-admin-page-status-report.php
2015-11-02 11:26:49 +00:00
Mike Jolley c29517e87e Merge branch 'pr/9471' 2015-11-02 11:24:01 +00:00
Mike Jolley aec0e0e327 supports() method which mirrors gateways
Closes #9471
2015-11-02 11:23:50 +00:00
Mike Jolley 3ca5022649 Added template files for the customer details list in emails. emails/email-customer-details.php
Closes #9253
2015-11-02 10:41:05 +00:00
Mike Jolley dfc1e0a625 Merge remote-tracking branch 'origin/master'
Conflicts:
	includes/admin/views/html-admin-page-status-report.php
2015-11-02 10:02:35 +00:00
Mike Jolley 781adc121c Check parent theme version
Closes #9477
2015-11-02 10:01:42 +00:00