Commit Graph

350 Commits

Author SHA1 Message Date
Mike Jolley 8b1b9c542c Color. Closes #632.
patrickgarman wants someone to merge 1 commit into woo themes:master from patrickgarman:master.
2012-02-14 15:34:12 +00:00
James Koster a08beb4a9f More fancybox 2012-02-14 15:14:07 +00:00
James Koster 43e1342c38 Fancybox tidying
removed extraneous markup / images replaced with css
2012-02-14 15:12:13 +00:00
James Koster 675b1d20ac Fancybox styles 2012-02-14 14:32:24 +00:00
Mike Jolley 871953aef3 min 2012-02-14 11:16:48 +00:00
Geert De Deckere 2849b3f532 Fixed 'unterminated string literal' in write-panels.js which broke the product data tabs 2012-02-14 11:59:00 +01:00
Patrick Garman 5bb373542a chocolate is a better default ;) need something other than white for custom statuses to be readable! 2012-02-13 20:00:37 +00:00
Mike Jolley 94d0a0cb3e Merge branch 'master' of https://github.com/woothemes/woocommerce 2012-02-13 19:44:17 +00:00
Mike Jolley 5139fa0920 Attributes panel 2012-02-13 19:21:52 +00:00
Mike Jolley 81c0a0eeaa variations panel cleanup 2012-02-13 15:08:54 +00:00
James Koster 1340126d23 star icons 2012-02-13 13:08:37 +00:00
Mike Jolley 57f5dc3296 Product page (admin) 2012-02-13 13:06:56 +00:00
Mike Jolley 32ae245056 Js min 2012-02-13 00:04:21 +00:00
Geert De Deckere 3bae87e394 Made confirmation for removing an attribute translatable 2012-02-12 17:29:32 +01:00
Mike Jolley e311b0d9fe hooks 2012-02-10 18:57:44 +00:00
Mike Jolley ef64bb8296 Few extra hooks in Javascript 2012-02-10 17:03:57 +00:00
Mike Jolley 808003e336 reset attribute select 2012-02-09 18:10:38 +00:00
Mike Jolley a562132458 Shipping classes for variations. Closes #553. 2012-02-08 14:39:31 +00:00
James Koster 85f6d53fab Comment fail :-) 2012-02-03 16:16:46 +00:00
Mike Jolley 20747c192d Hide message 2012-01-31 23:18:40 +00:00
Mike Jolley 17e22c8029 update_checkout trigger Closes #550. 2012-01-31 18:13:21 +00:00
James Koster cb180f87e2 different ticks 2012-01-28 18:32:53 +00:00
Mike Jolley c57ab7c33f Product page tidy + success icons 2012-01-28 15:20:49 +00:00
Mike Jolley 5ef054f1f8 Product admin tweaks 2012-01-27 20:21:36 +00:00
Mike Jolley de6b06b864 Add to cart validation, and a different redirect if theres an error 2012-01-27 18:31:30 +00:00
Mike Jolley 89a226a895 Store cart + shipping tax rows instead of a combination 2012-01-27 15:00:03 +00:00
Mike Jolley 2cfa6f046a Icon tweak 2012-01-25 22:07:44 +00:00
Mike Jolley 60647b0838 Error list. Closes #528. 2012-01-25 20:37:21 +00:00
Mike Jolley aa9f4385c8 Order items styling 2012-01-22 02:36:59 +00:00
Mike Jolley c0b6791944 Javascript for order total calculations 2012-01-22 02:36:46 +00:00
Mike Jolley 31fc0c6cca Cleaned up order page styling 2012-01-21 16:59:09 +00:00
Mike Jolley 197b629307 Chart/report fixes 2012-01-18 16:54:05 +00:00
Mike Jolley 3802145b96 Notice 2012-01-18 12:26:31 +00:00
Mike Jolley ce6f77d4e0 data-max for quantity inputs 2012-01-14 17:59:47 +00:00
Mike Jolley 2e66169262 Merge branch 'master' of https://github.com/woothemes/woocommerce 2012-01-14 01:24:11 +00:00
Mike Jolley aa4b074ca3 Rounding and calc totals 2012-01-14 01:23:16 +00:00
Mike Jolley cd8b0fd492 Order calculations 2012-01-13 21:25:39 +00:00
James Koster e79188b35c attributes table and tidy up 2012-01-13 15:13:57 +00:00
James Koster 9bd50d1897 Tabs 2012-01-13 14:04:04 +00:00
Mike Jolley 37a334cfc6 Tweak errors 2012-01-13 12:40:34 +00:00
James Koster 6cd6dafc11 price filter 2012-01-13 12:35:02 +00:00
Mike Jolley 8dbe617f21 Fix for locale counties. Closes #487. 2012-01-13 11:44:35 +00:00
James Koster b70e25eab2 More fronted stuff 2012-01-12 16:41:44 +00:00
James Koster 7a43e72982 more default css updates 2012-01-12 15:25:28 +00:00
Mike Jolley d94dc997b5 Merge 2012-01-12 00:45:20 +00:00
Mike Jolley 1dc5a3bc0b Revert 136456f805ccdf9b7b6bce027dc24da3c14d4281^..HEAD 2012-01-12 00:43:30 +00:00
Mike Jolley 0ac712b193 merge 2012-01-12 00:38:21 +00:00
Mike Jolley 70a799757c JS fix 2012-01-11 19:09:48 +00:00
James Koster d77fef200d New buttons styles for default theme 2012-01-11 19:07:33 +00:00
Mike Jolley 4756376faa JS fix 2012-01-11 19:06:06 +00:00
Mike Jolley 645d59f51b Tabs 2012-01-11 18:59:30 +00:00
Mike Jolley 4287a0628f Option to show children only in widget. Closes #472. 2012-01-10 14:55:08 +00:00
Mike Jolley 86afeaf594 Show order backend fields. Closes #460. 2012-01-09 15:42:37 +00:00
Mike Jolley ca8523361b JS Tweaks 2012-01-07 15:36:12 +00:00
Mike Jolley df1170a716 Delete all variations. Closes #243. 2012-01-06 15:57:24 +00:00
Mike Jolley 6650434c3f Theming improvement 2012-01-06 14:02:34 +00:00
Mike Jolley 24332672ad Payment method. Closes #449. 2012-01-05 12:11:34 +00:00
Mike Jolley c2640d7524 Image size optimisation 2012-01-05 10:51:31 +00:00
Mike Jolley fb5bb626e8 Shipping tax calc + rows, fixed up write panel 2012-01-04 16:24:26 +00:00
Mike Jolley cd9aaa7f6f Local tax rate interface 2012-01-03 10:01:19 +00:00
Mike Jolley 8733821091 Email totals, interface for local tax rates 2012-01-02 17:45:26 +00:00
Mike Jolley bd4eaa9eb1 Tax rows and add order line item ajax 2011-12-31 19:03:41 +00:00
Mike Jolley 1de85e5d19 More taxes + totals work. Line item tweaks.
Next step; shipping.
2011-12-30 14:00:41 +00:00
Mike Jolley 90a257b4fa Tax rows and compound taxes on cart page 2011-12-28 23:59:33 +00:00
Mike Jolley 86233f09ba Changed order item rows (stored)
Instead of storing price ex. vat, we use the catalog settings. This
eliminates rounding errors and needing to store totals to high
precision.

Also, now storing tax class/status, line cost, and line tax. This will
allow us to support compound and stacked taxes (which are too complex
to do by storing just tax rate alone).

Old orders data will be missing for line item costs, but order totals
will be unaffected. This is unavoidable.
2011-12-28 13:02:13 +00:00
Mike Jolley 795f560b5f JS for keys 2011-12-24 17:21:39 +00:00
Mike Jolley 364c0bd54c Renamed all product data meta keys
This is so they are hidden (_). Should have done this long ago. Few
extensions will need updating when 1.4 goes out to reflect these
changes, mainly importers.
2011-12-24 16:57:36 +00:00
Mike Jolley e8e908b2b6 Write panel tweaks 2011-12-24 15:32:18 +00:00
Mike Jolley f28e4866e0 Shipping calc fix + markup change 2011-12-23 20:29:10 +00:00
Mike Jolley 4fb716d775 CSS. Closes #397. 2011-12-21 23:52:52 +00:00
Mike Jolley 74bb271e96 Filter checkout fields..
.. you can pretty much turn off all fields now - although, you'll need
to turn off tax + shipping calcs too since they rely on addresses to
function.
2011-12-21 21:56:01 +00:00
Mike Jolley cc91cf5618 Conditional options 2011-12-21 21:12:48 +00:00
Mike Jolley b8eeda72bd Show variable sku. Closes #350. 2011-12-19 19:10:59 +00:00
Mike Jolley c4625ad91e Coupon on checkout. Closes #379. 2011-12-19 17:11:19 +00:00
Mike Jolley 665d8bf512 Shipping method ordering. Closes #347. 2011-12-19 14:05:32 +00:00
Mike Jolley 8788f8fb68 Products short code fix 2011-12-19 10:53:01 +00:00
Mike Jolley 18cc9a9442 Admin formatted address 2011-12-18 13:41:42 +00:00
James Koster 909bea5d02 Made star.png transparent 2011-12-17 19:21:51 +00:00
Mike Jolley f04256320d Locale stuff. Added locales for address fields for countries.
next step is to make the address formats work.
2011-12-16 21:19:56 +00:00
Mike Jolley 03891e7f56 Dynamic checkout fields based on locale 2011-12-16 15:11:41 +00:00
Mike Jolley 073d3cb2f0 Putting localisation stuff in countries class 2011-12-15 23:24:02 +00:00
Mike Jolley df24e9e743 Locale settings for checkout
Work for base country, now it needs to be dynamic when changing
countries
2011-12-15 20:34:14 +00:00
Mike Jolley fe3242558a Working on locales, also added 'chosen' as an option for the checkout 2011-12-15 20:34:14 +00:00
Mike Jolley feb9afd30b Started work on locale options for ticket #316.
Plan is to combine locale options with the checkout array so fields can
be overridden.
2011-12-15 01:14:47 +00:00
Mike Jolley 3bb4d6554a Currency symbol change 2011-12-14 12:17:05 +00:00
Mike Jolley cf52e99bd5 File download method opton 2011-12-07 21:26:53 +00:00
Mike Jolley 5f5eb20335 Sort gateways and set a default 2011-12-06 16:45:08 +00:00
Mike Jolley d37608e7f4 Bar chart changes 2011-12-05 12:10:49 +00:00
Mike Jolley 16853cb6f6 Per order shipping with classes 2011-12-02 20:48:07 +00:00
Mike Jolley 172a34a9b9 Broke up scripts and made jquery ui optional 2011-12-02 11:43:15 +00:00
Mike Jolley 9eb7b4dd13 Tidied up script loaders 2011-12-02 11:11:33 +00:00
Mike Jolley 528f59c1e5 min 2011-12-02 09:43:37 +00:00
Mike Jolley f8f19c9881 Merge pull request #303 from curtismchale/master
Fixed fancy box close icon
2011-12-02 01:41:21 -08:00
Curtis McHale dffa0fefa3 Fixed the width and height of the sprite call because it was showing other images on the sides. 2011-12-01 15:23:50 -08:00
Mike Jolley 6dc4d2add8 Final tax logic fixes
Storing base cost/discounted cost instead of row_discount to keep calks
simple and maintain backwards compatibility.
2011-11-30 00:30:39 +00:00
Mike Jolley ea3b016aba minified 2011-11-28 17:12:21 +00:00
Mike Jolley c99f7a2151 Merge pull request #285 from lucasstark/patch-2
Add a custom event, variationWrapShown, fired after the variation slide ...
2011-11-28 09:11:32 -08:00
lucasstark 0e79d68765 Add a custom event, variationWrapShown, fired after the variation slide down is complete. 2011-11-28 12:07:40 -05:00
Mike Jolley a2ca5f6a78 Styling, address_override 2011-11-28 16:35:17 +00:00
Mike Jolley 764341b228 Settings API 2011-11-28 15:50:19 +00:00
Mike Jolley 895a24696f Added dimensions to individual variationsAdded dimensions to individual variations. Closes #272. 2011-11-28 13:13:49 +00:00
Mike Jolley 9f359335db Textarea for attributes. Closes #275. 2011-11-28 10:29:23 +00:00
Mike Jolley c42f624243 Message in variations tab when no attributes are set up. 2011-11-27 14:36:41 +00:00
Mike Jolley c2985e11e8 JS rounding 2011-11-26 20:15:21 +00:00
Mike Jolley 2abd9a1644 Type + tooltips 2011-11-26 16:41:48 +00:00
Mike Jolley f7b4bebacc Final tax rounding issues 2011-11-26 16:15:25 +00:00
Mike Jolley 14a169151d Ability to load shipping/billing from selected customer 2011-11-26 12:32:44 +00:00
Mike Jolley d735f13f70 Calculate totals (JS) rounding 2011-11-25 23:42:46 +00:00
Mike Jolley b681ec5788 Changed discount to row_discount 2011-11-25 22:36:02 +00:00
Mike Jolley d954419417 Tax calculations for adjusted rates 2011-11-25 22:13:01 +00:00
Mike Jolley a55adaca3e Store discount for products (pre-tax) 2011-11-25 19:31:06 +00:00
Mike Jolley 5fd566b47c Improved look and feel of the orders section 2011-11-25 18:44:44 +00:00
Mike Jolley b25436753d All inputs now use 'chosen' instead of the multiselect widget 2011-11-23 17:28:58 +00:00
Mike Jolley e0552ff3f7 Improved tax form - should improve usability 2011-11-23 14:39:28 +00:00
Mike Jolley 99fdf94a48 More chosen selects 2011-11-23 12:02:36 +00:00
Mike Jolley 4d6a9750fb Admin bits 2011-11-23 10:08:48 +00:00
Mike Jolley c3faee08b5 Started adding support for 'chosen' - a select element enhancer 2011-11-23 00:44:11 +00:00
Mike Jolley 8b4e811346 Encoding issues in attributes/variations 2011-11-18 17:27:45 +00:00
Mike Jolley 0af9b98d18 Fixed quick edit 2011-11-18 15:03:29 +00:00
Mike Jolley ea216049c1 Fixed upload directory. Closes #210. 2011-11-17 00:49:20 +00:00
Mike Jolley cda736f804 Style fix 2011-11-16 22:52:46 +00:00
Mike Jolley 300a64f6bc Added basic links to order pages from reports. Closes #150.
Doesn't do date ranges - does a custom search by product name.
2011-11-16 21:18:59 +00:00
Mike Jolley 6a5b7d88a5 Fixed some html5 validation bits 2011-11-16 17:55:22 +00:00
Mike Jolley 6d08f380f5 JS min 2011-11-16 15:33:35 +00:00
Mike Jolley ac3ddba858 Country defaults to store base. State field defaults to 'please select state' - not alabama for US. Closes #200. 2011-11-16 15:25:45 +00:00
Mike Jolley 878dae75e8 input-text (thanks @lukecarbis) 2011-11-16 09:56:35 +00:00
Mike Jolley b23338c2b0 Prevent checkout being submitted twice 2011-11-16 09:38:04 +00:00
Mike Jolley 96272f0e48 styles 2011-11-15 22:21:06 +00:00
Mike Jolley eb1c9f9432 Height fix 2011-11-15 18:09:21 +00:00
Mike Jolley 51e921c7f6 Fixed menu icons. Closes #181. 2011-11-14 16:57:53 +00:00
Mike Jolley 82dd746f1b JS change 2011-11-14 12:02:42 +00:00
Mike Jolley 35cb53afde Fancybox script order. Closes #179. 2011-11-10 11:51:51 +00:00
Mike Jolley 8b125d1ff6 Variations -downloadable and virtual options 2011-11-09 23:06:17 +00:00
Mike Jolley 4e2c1e1580 Improved variations add/remove image button 2011-11-09 19:20:32 +00:00
Mike Jolley a52c6b1437 Affilaite/external product type. Closes #166. 2011-11-08 16:15:36 +00:00
Mike Jolley f4694cf640 Fix states (loading from account) 2011-11-08 10:22:30 +00:00
Mike Jolley f80828f27f Check uniform is declared. Closes #154. 2011-11-07 15:38:00 +00:00
Mike Jolley 5a99105123 woocommerce_product_add_to_cart shortocode 2011-11-07 15:09:46 +00:00
Mike Jolley 0d74014d4a Added handles. Closes #137. 2011-11-07 14:13:04 +00:00
Mike Jolley de32a8eb8c JS quantity 2011-11-07 11:41:57 +00:00
Mike Jolley 869f413e9b New cart code adapted from Lucas Starks pull request.
Cart items are indexed by an md5 hash rather than numeric keys so we
can add custom data to cart items.

Plugins can hook in and add meta data, load it, and display it. The
adjust_price() function lets you adjust a products price too since its
loaded and stored in the cart on page load.

All works like a dream, all thats left is to show the values on the
cart page, and store them in the order item meta. Order item meta does
need a slight change though, to allow data with the same keys. Working
on that next.
2011-11-06 13:45:18 +00:00
Mike Jolley b1e179aa0f Large change to product types
Removed downloadable and virtual product types in favour of a
downloadable/virtual checkbox option meaning variations can also now be
virtual (no shipping) or downloadable. This should make it more
flexible.

Not many changes were needed to template since simple, downloadable,
and virtual were all pretty similar anyway.

Added a filter for admin for the new sub-types.

In the future variations should have boxes too for downloadable/virtual
so you can mis it up with physical/downloadable goods in the same
product :)
2011-11-05 19:03:03 +00:00
Mike Jolley 85e93a391e Option for ajax add to cart Closes #79. 2011-11-04 20:57:54 +00:00
Mike Jolley 7a78c5c98a Products on sale widget + transient. Closes #66. 2011-11-04 20:46:06 +00:00
Mike Jolley 2ce7485f36 Shortcode inserter + shortcode for products by category. Closes #139. 2011-11-04 20:15:55 +00:00
Mike Jolley b30c14ba64 Minor tweak to JS 2011-11-04 18:58:15 +00:00
Mike Jolley 25c18161e2 xhr variable to fix double loading. Closes #126. 2011-11-02 20:51:07 +00:00
Mike Jolley b7d9cb18ae Optimisations and emails can contain gateway specific text. Closes #131. 2011-11-02 20:32:35 +00:00
Mike Jolley aa97182775 Fixed state field. Closes #128. 2011-11-01 18:27:25 +00:00
Mike Jolley 8785c312b8 Options to define default attribute selections in variations. Closes #46. 2011-11-01 18:19:01 +00:00