Commit Graph

432 Commits

Author SHA1 Message Date
Mike Jolley 249f18f70d Merge branch 'credit-notes' of https://github.com/woothemes/woocommerce into credit-notes
Conflicts:
	assets/js/admin/meta-boxes-order.min.js
2014-07-22 16:44:23 +01:00
Mike Jolley 3e4506c376 Clean up total/subtotal display 2014-07-22 16:44:02 +01:00
claudiosmweb 7b5b1fc845 prevented that exist duplicate tax rate columns #3164 2014-07-22 12:42:17 -03:00
claudiosmweb aae1dbbe2e fixed refunds button with the corrent total when using commas instead of decimals 2014-07-22 11:40:26 -03:00
Mike Jolley 01950bebdc Add confirmation before deleting tax column #3164 2014-07-22 15:26:18 +01:00
Mike Jolley b032c857ee Fix delete of shipping and fee line items. Remove checkbox for refunds. 2014-07-22 14:38:07 +01:00
Mike Jolley 6e0a880699 Group line items by type 2014-07-22 14:18:11 +01:00
claudiosmweb 8d257efa92 fixed the modals with ajax 2014-07-20 23:58:34 -03:00
claudiosmweb d2340a5cef fixed refund calcule 2014-07-20 23:26:40 -03:00
claudiosmweb 144d094ad2 created method for delete order tax 2014-07-20 22:57:23 -03:00
claudiosmweb d875cfa1ac created ajax method to add new taxes 2014-07-20 22:36:12 -03:00
claudiosmweb 3e287ff19c fixed calculate total action 2014-07-20 21:12:39 -03:00
claudiosmweb 20f4509a93 created a simple jquery plugin for open backbone modals 2014-07-20 15:25:20 -03:00
claudiosmweb 794548e923 added tiptip for order totals 2014-07-18 20:27:10 -03:00
claudiosmweb e0aeacb734 added action to calculte the order total and edit discount and total 2014-07-18 17:24:34 -03:00
claudiosmweb d321395946 created new methods to save and load the order items in shop_order screen 2014-07-17 17:17:54 -03:00
claudiosmweb 501cc29bd9 hide the order totals when active the refunds panel 2014-07-16 23:08:59 -03:00
claudiosmweb af235e08f6 moved refunds to order items 2014-07-16 17:12:33 -03:00
claudiosmweb d7133035e1 added order items add shipping cost button 2014-07-16 15:41:18 -03:00
claudiosmweb 04e8fbcb5e added new add products order items action 2014-07-16 15:11:48 -03:00
claudiosmweb 3ca145ac85 created backbone modal dialog 2014-07-15 19:56:07 -03:00
Mike Jolley eca4025f5e Delete and display refunds 2014-07-10 16:39:10 +01:00
Mike Jolley 280b884c28 Create refunds and process via gateway 2014-07-10 14:49:04 +01:00
Mike Jolley d88279fe53 Start on ajax handlers 2014-07-10 13:33:05 +01:00
Mike Jolley e7dc58ac31 Tidied up order script 2014-07-10 11:25:50 +01:00
Mike Jolley 8ccd716062 Fix parsefloat 2014-07-10 11:00:48 +01:00
Mike Jolley c15b8e817c split up meta box scripts 2014-07-08 14:14:41 +01:00
Mike Jolley 2282d76efb More UI / Split up meta box scripts 2014-07-08 14:14:29 +01:00
Mike Jolley 5c0ea16a39 More refund UI -show qty boxes and totals 2014-07-08 10:51:10 +01:00
Mike Jolley fdccaa21d3 Rough, non-functioning example of the UI for refund total and add items in the order items panel
#3164
2014-07-07 16:45:08 +01:00
Mike Jolley 63c0b75972 Conditional is no longer required 2014-06-24 13:00:21 +01:00
Mike Jolley 7591e07d81 Field show/hide options for stock fields and variations 2014-06-19 16:17:43 +01:00
Mike Jolley 93778e72b0 Tax class fixes + notices 2014-06-13 15:53:59 +01:00
Mike Jolley 526ad2e30d Min 2014-05-28 11:28:25 +01:00
claudiosmweb 322c655e61 added validation for country code in tax settings, closes #5180 2014-05-27 19:03:21 -03:00
Mike Jolley 84740c1449 Merge pull request #5560 from woothemes/remove-tinymce-button
Removed unused TinyMCE button
2014-05-27 13:02:02 +01:00
Coen Jacobs 09a9463b0a Removed unused TinyMCE button 2014-05-26 16:17:56 +02:00
splashingpixels 7e787530e3 added check to make sure thumbnail url exists otherwise fallback to main url 2014-05-23 07:29:08 -07:00
splashingpixels 029bed8631 added delete variation image to be more specific 2014-05-22 20:46:42 -07:00
splashingpixels 22e9f833b1 return thumb size of variation image on upload 2014-05-22 20:18:50 -07:00
Mike Jolley a042bd00dd Minify 2014-04-30 11:20:25 +01:00
Mike Martel 6918602002 Updated minified woocommerce_admin JS 2014-04-25 09:29:21 +02:00
Mike Martel dc1271ce19 Cleanup indentation in woocommerce_admin.js
File mixed tabs and spaces. Converted all spaces to tabs.
2014-04-25 09:28:35 +02:00
Mike Martel 5b81c7f320 Allow negative amount in price field validation
The price field validation method in the admin js did not allow negative numbers, which are valid as eg. negative fees.
2014-04-25 09:28:35 +02:00
Mike Martel e0dc31620b Bind price and decimal input events to body in woocommerce_admin js
The event was bound to the element directly, causing problems when the elements was added after dom ready (through ajax). Now the decimal format check will always take place.
2014-04-25 09:28:35 +02:00
James Koster c5656ee991 flat rate additional costs table 2014-03-25 13:59:30 +00:00
Mike Jolley 8007e4c102 Fix encoding issue with attribute values and move variation data to tooltip Closes #5169 2014-03-20 15:47:52 +00:00
Juraj Kiss 888d57911c Fix bulk editing variation sale price #5164 2014-03-18 13:51:10 +01:00
Mike Jolley c211164514 min 2014-03-17 10:53:54 +00:00
splashingpixels 0fda637dd9 lingering tooltip after gallery image delete fixes #5124 2014-03-13 21:27:18 -07:00
Mike Jolley 340efa690d Minify scripts for #5109 2014-03-12 14:34:49 +00:00
splashingpixels be85affc89 variation bulk sale price edit over reaching causing errors on save 2014-03-11 17:03:55 -07:00
Mike Jolley ef0567ac4f Fix bulk edit % increase and decrease Closes #5068 2014-03-06 13:03:12 +00:00
Mike Jolley c01022f189 Fix variable product add file button after adding a new variation Closes #4994 2014-03-03 12:09:43 +00:00
Mike Jolley 77929bc27f grunt dev - updated languages 2014-02-27 14:21:25 +00:00
Patrick Rauland f83cd143b6 adding year picker to reports section 2014-02-26 16:29:20 -06:00
Mike Jolley 33ab2efb21 Min 2014-02-17 12:09:39 +00:00
claudiosmweb 199c13efda fixed the input names in assets/js/admin/meta-boxes-variations.js 2014-02-14 18:56:38 -02:00
claudiosmweb 3dd39c1fb9 fixed coding standards meta-boxes-variations.js
fixed some JSHint issues
this commit helps in #4680
2014-02-14 18:49:36 -02:00
claudiosmweb f3eb602532 fixed the indendation in assets/js/admin/meta-boxes-variations.js 2014-02-14 18:28:23 -02:00
claudiosmweb d3e4a18763 fixed the variation bulk edit, closes #4807
solved the issue with increase and decrease values forcing to be string the prompt return value
2014-02-14 18:24:48 -02:00
Mike Jolley 1ad036ebfb Fix multiple image selection for product gallery Closes #4751 2014-02-13 10:37:02 +00:00
Mike Jolley aa0842a2a6 Fix manual order calculation when using non-standard decimal points Closes #4742 2014-02-12 15:01:56 +00:00
Mike Jolley b1b6e10b98 Result of Grunt minification + tx pull 2014-02-03 14:35:26 +00:00
toddlahman 13c24b410e Removed (document).ready from jQuery scripts
jQuery(document).ready(function($) { is equivalent to calling
jQuery(function($) {.

http://api.jquery.com/ready/
2014-01-30 18:44:17 -08:00
splashingpixels 8f5bf6dde7 Replaced deprecated jQuery live methods with on 2014-01-24 10:34:48 -08:00
vrozkovec 3fe9994d59 Merge branch 'master' of git@github.com:vrozkovec/woocommerce.git 2014-01-08 01:39:28 +01:00
vrozkovec cb9a6fc8df Add filter options to product gallery images selector to make visible
filters of plugins such as the Enhanced Media Library
2014-01-08 01:38:54 +01:00
Vit Rozkovec 17a02b71c0 Update meta-boxes.js
Add filter options to product gallery images selector to make visible filters of plugins such as the Enhanced Media Library
2014-01-08 01:28:39 +01:00
Mike Jolley 2600744fd9 #4374 2013-12-31 12:22:05 +00:00
splashingpixels 6487bc1125 tooltips on variations not showing after using link all variations button Fixes #4366 2013-12-14 07:50:18 -08:00
Coen Jacobs 5ef0ba6a37 Minification for #4237 2013-11-28 14:39:42 +01:00
Gerhard 903af259e0 refactor inline product images js 2013-11-28 14:37:44 +02:00
Gerhard 238becb050 Refactor order notes inline js 2013-11-28 14:03:29 +02:00
Mike Jolley 0e0b9648d6 Minify #4213 2013-11-27 14:33:09 +00:00
Gerhard 06020f4bd5 Move all download permissions inline js to meta-boxes.js 2013-11-27 16:03:04 +02:00
Gerhard 6300e65582 Make downloadable product dropdown ajaxy, as per #4211 2013-11-26 15:54:34 +02:00
Mike Jolley 8e7e75fc83 Add order item meta correct ajax hook 2013-11-25 16:30:12 +00:00
Mike Jolley fc87619d4c Correct add order item ajax event 2013-11-25 16:26:07 +00:00
Mike Jolley 0fae180f24 Minify all the things 2013-11-25 16:03:43 +00:00
Coen Jacobs 4afbd0b556 Merge branch 'function-call-refactor'
Conflicts:
	includes/admin/post-types/meta-boxes/class-wc-meta-box-order-data.php
	includes/shortcodes/class-wc-shortcode-cart.php
	includes/wc-template-functions.php
2013-11-25 15:42:26 +01:00
Coen Jacobs f7df17db1c Order functions woocommerce to wc refactor 2013-11-25 14:54:52 +01:00
Gregory K 8539e81d79 "export" is a reserved word in JavaScript 2013-11-25 07:18:01 -05:00
James Koster 489bf34385 attributes table. closes #4118 2013-11-19 11:04:45 +00:00
Mike Jolley 645ca3e834 WC_Ajax class for ajax events 2013-11-14 12:13:34 +00:00
Mike Jolley ea05881af9 Conflicts 2013-11-12 17:46:22 +00:00
Mike Jolley 3fd02a57d0 Locales - store standardised values, and display using locale in admin #3862 2013-11-12 17:43:30 +00:00
James Koster f50e741397 fix handledivs in meta boxes #4042 2013-11-12 17:01:13 +00:00
Mike Jolley 9a82aecaad Min 2013-11-08 17:03:59 +00:00
Mike Jolley ac6bb25a22 Merge pull request #4053 from helgatheviking/feature/variation-bulk-edit-trigger
Add a custom trigger handler based on the value of select#field_to_edit
2013-11-08 08:08:12 -08:00
Kathy Darling a97e1a697d Add a custom trigger handler based on the value of select#field_to_edit 2013-11-03 18:50:24 +01:00
Scott Basgaard 5b4ef0b8bd Class name consistency for woocommerce_attributes > product_attributes. See #4019 2013-11-01 13:06:14 -04:00
Mike Jolley 423cedc425 Wordwrap 2013-10-25 14:42:05 +01:00
Mike Jolley 0d8d95e8e6 total calcs 2013-10-24 13:41:42 +01:00
Mike Jolley 51aba21d76 Rounding + precision for taxes. Store unrounded. Round down (for the moment) for taxes 2013-10-24 13:15:42 +01:00
Scott Basgaard 90b503e2c6 Use minified quick-edit.js 2013-10-23 17:36:32 +02:00
Mike Jolley 8ce3b8dd57 Filters for shortcode tags 2013-10-23 14:55:18 +01:00
Mike Jolley cf6db831e4 Removed old pages 2013-10-23 09:47:36 +01:00
Mike Jolley 5d2e1ac031 Refactor coupon code so coupons get the actual discount amount, redone edit coupon screen with tabs, added coupon item limits which Closes #3902 2013-10-18 18:10:58 +01:00
Scott Basgaard db405fa0ff Don't be so generous with this jQuery selector. Fixes #3933 2013-10-17 12:25:14 +02:00
Mike Jolley 6646b7817b Styling and removed un-used script. #3897 2013-10-10 18:16:06 +01:00
Mike Jolley 718093650f Save fees 2013-10-02 12:58:26 +01:00
Mike Jolley 24a3e3e17b Format decimals with single function, convert locale to standard form. #3862 2013-10-01 17:54:32 +01:00
Mike Jolley b892815336 Remove html5 number inputs (unreliable at present, locale issues), add JS validation for price inputs. New price input type in settings API to make future changes easier to implement. Closes #3587
@coenjacobs hows this look?
2013-09-27 20:28:42 +01:00
Mike Jolley 67b50e7eaa Sortable downloads #3812 2013-09-26 16:35:37 +01:00
Mike Jolley 96a7a4b730 Restructure 'file_paths' to allow for names (Closes #3320) etc. For #2765.
@coenjacobs @justinstern @maxrice These are major changes - CC ing you
guys in to take a quick look through. I know some extensions such as
vouchers will be affected.
2013-09-20 17:01:09 +01:00
Mike Jolley 9590a03e2f Fix tax rule detection. Closes #3698.
@coenjacobs .15
2013-09-13 16:34:41 +01:00
Mike Jolley 759e74c860 Safari doesn't support the 'download' attribute. At least get it to open. Closes #3754 2013-09-13 13:38:36 +01:00
Mike Jolley 3c8c620c5d Bulk/quick edit backorders Closes #3729 2013-09-06 11:17:41 +01:00
Mike Jolley 5e51ef1fce Refactor variation bulk edit JS Fixes #3148 2013-09-03 17:35:20 +01:00
Mike Jolley 3d078397b3 Merge branch 'Re-organise-settings'
Moves settings together. Fixes #3497
2013-08-22 11:58:03 +01:00
Mike Jolley f2586d8d76 Fix bulk edit status Fixes #3614
@coenjacobs .14
2013-08-19 13:00:40 +01:00
Mike Jolley 2428c9f268 Expand when calculating totals 2013-08-16 17:00:49 +01:00
Mike Jolley a66472d148 Order panel improvements + save multiple shipping methods 2013-08-16 16:43:26 +01:00
Mike Jolley 7cd4e46846 Cleaner orders items, and show meta in text until editing.
@coenjacobs this commit has the urldecode fix. Will move it over to
master/.14 later
2013-08-15 16:49:09 +01:00
Mike Jolley f09fafe738 Meta box refactor
Closes #3458.
2013-08-06 11:41:20 +01:00
Mike Jolley 110d8c3026 BACS, Cheque, COD Closes #3172
Rather than merging them (they are all different) I've refactered code
and added multiple accounts in BACS which has had multiple requests.
2013-08-05 16:34:54 +01:00
Mike Jolley 03af136986 Separate ship to options from sell to. Closes #3215. 2013-08-02 16:54:28 +01:00
Mike Jolley 981575491d Review order columns Closes #2798. 2013-07-31 15:12:53 +01:00
Mike Jolley 12d705c9c4 Bulk and quick edit tax status/class. Closes #3530. 2013-07-30 14:43:45 +01:00
Mike Jolley 9462dde581 Settings refactoring 2013-07-26 15:36:28 +01:00
Mike Jolley 725cb7714b More endpoints for myaccount pages, and endpoint options so they can be modified. Closes #3170. 2013-07-23 17:05:01 +01:00
Mike Jolley f295a5d568 Merge branch 'Charts/Reports' Closes #3281 2013-07-18 14:08:27 +01:00
Mike Jolley 8104048ddc Export reports to CSVs #3281 2013-07-18 12:56:12 +01:00
Mike Jolley 0a8be76453 killed code relating to dashboard sales 2013-07-18 09:23:21 +01:00
Mike Jolley 1c1d60b375 Customer reports 2013-07-09 15:31:22 +01:00
Mike Jolley 400fd1538b input instead of :checkbox Closes #3408. 2013-06-28 11:22:12 +01:00
Mike Jolley 72bb335662 by category 2013-06-27 21:34:18 +01:00
Mike Jolley 6f5200de1b By cat 2013-06-27 18:39:55 +01:00
Mike Jolley dcee729de4 class based reports - top sellers and earners, added cache based on query hash 2013-06-26 15:11:33 +01:00
Mike Jolley d30f6b55f2 Reports + sparklines 2013-06-25 14:59:20 +01:00
Mike Jolley d7cfe05daf More charts work 2013-06-24 17:47:28 +01:00
Mike Jolley 111011e8a6 flot min 2013-06-22 11:44:18 +01:00
Mike Jolley 0e29b31fcb Work on charts/reports 2013-06-22 11:37:59 +01:00
Mike Jolley a3c2cef3f7 Better account edit Closes #3168 2013-06-05 12:07:23 +01:00
Mike Jolley 4aef7c73ee View order page endpoint 2013-06-04 17:33:43 +01:00
Mike Jolley e4f4b09ba6 Pay page and thanks page endpoints. Requires permalink save. Closes #3170. 2013-05-31 16:13:18 +01:00
Mike Jolley 8fbd2da48d Separate out accounting.js and format dashboard sales currency. Closes #3151. 2013-05-28 15:27:26 +01:00
Justin Stern 7e982352f3 Order Items List Quantity Change Javascript event
Adds an event named 'quantity_changed', fired when the order items
quantity is changed
2013-04-18 16:05:53 -04:00
Mike Jolley 1de718099b readme and minify 2013-04-16 13:49:49 +01:00
Mike Jolley b40cf953f3 Merge pull request #2968 from piffpaffpuff/master
use base_country for tax calculations in manually created orders
2013-04-16 05:48:59 -07:00
Mike Jolley d73e3fedb9 Fix path insert bug. Closes #2947. 2013-04-15 14:55:00 +01:00
Triggvy Gunderson 53c13f721b base_country js param for order tax calculation
added  woocommerce_writepanel_params.base_country to fix tax
calculation when an order is created manually. if you click the button
calc taxes the js uses base_country to calc when no billing/shipping
country is selected. just like the the message says: "If no
billing/shipping is set it will use the store base country".
2013-04-14 22:59:18 +02:00
Mike Jolley bb1c532218 filename, break query string off 2013-03-28 12:31:48 +00:00
David Decker d39f011880 Fix hardcoded 'Pages' string in visual editor button, patch for Issue #2835 2013-03-27 23:12:10 +01:00
Mike Jolley 946ecaaae2 Tweak - Filters for attribute default values. 2013-03-15 19:33:42 +00:00
Coen Jacobs 0770515825 show_classes var didn't contain show_if_external. Closes #2542 2013-02-28 16:44:27 +01:00
Mike Jolley 505f9f0b43 Stock increase/descrease alerts Closes #2536. 2013-02-27 12:50:02 +00:00
Mike Jolley 80b4ef14c9 Slugs are unreliable, and support show_if hide_if for all product types 2013-02-26 15:14:49 +00:00
Mike Jolley 890640afca Remove, don't hide. Closes #2532. 2013-02-26 14:36:18 +00:00