Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
kilbot committed Jun 28, 2014
1 parent 8d1eb4b commit acc3ea5
Show file tree
Hide file tree
Showing 18 changed files with 103 additions and 50 deletions.
17 changes: 0 additions & 17 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,23 +150,6 @@ module.exports = function(grunt) {
},
},

// // image optimization
// imagemin: {
// dist: {
// options: {
// optimizationLevel: 7,
// progressive: true,
// interlaced: true
// },
// files: [{
// expand: true,
// cwd: 'assets/',
// src: ['**/*.{png,jpg,gif}'],
// dest: 'assets/'
// }]
// }
// },

// unused
// convert readme.txt to readme.md
wp_readme_to_markdown: {
Expand Down
Binary file added assets/favicon-114.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicon-120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicon-144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicon-152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicon-57.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicon-72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified languages/woocommerce-pos-es_ES.mo
Binary file not shown.
Binary file modified languages/woocommerce-pos-nb_NO.mo
Binary file not shown.
Binary file modified languages/woocommerce-pos-nl_NL.mo
Binary file not shown.
Binary file modified languages/woocommerce-pos-pt_BR.mo
Binary file not shown.
50 changes: 44 additions & 6 deletions languages/woocommerce-pos.pot
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ msgid ""
msgstr ""
"Project-Id-Version: WooCommerce POS 0.3\n"
"Report-Msgid-Bugs-To: https://github.com/kilbot/WooCommerce-POS/issues\n"
"POT-Creation-Date: 2014-06-27 02:58:03+00:00\n"
"POT-Creation-Date: 2014-06-28 15:03:42+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2014-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Team Name <[email protected]>\n"
"X-Generator: grunt-wp-i18n 0.4.5\n"

#: admin/class-pos-admin.php:262
msgid ""
Expand Down Expand Up @@ -68,6 +69,7 @@ msgid "The default customer for POS orders, eg: Guest or create a new customer"
msgstr ""

#: admin/includes/settings/class-settings-general.php:69
#: public/class-pos.php:279 public/includes/class-pos-ajax.php:101
msgid "Guest"
msgstr ""

Expand Down Expand Up @@ -135,7 +137,43 @@ msgstr ""
msgid "Delete orphans"
msgstr ""

#: public/includes/class-pos-checkout.php:44
#: public/class-pos.php:342
msgid "No matches found"
msgstr ""

#: public/class-pos.php:343
msgid "Please enter 1 more character"
msgstr ""

#: public/class-pos.php:344
msgid "Please enter %d more characters"
msgstr ""

#: public/class-pos.php:345
msgid "Please delete 1 character"
msgstr ""

#: public/class-pos.php:346
msgid "Please delete %d characters"
msgstr ""

#: public/class-pos.php:347
msgid "You can only select 1 item"
msgstr ""

#: public/class-pos.php:348
msgid "You can only select %d items"
msgstr ""

#: public/class-pos.php:349
msgid "Loading more results"
msgstr ""

#: public/class-pos.php:350
msgid "Searching"
msgstr ""

#: public/includes/class-pos-checkout.php:48
msgid "Order &ndash; %s"
msgstr ""

Expand Down Expand Up @@ -274,15 +312,15 @@ msgstr ""
msgid "Support"
msgstr ""

#: public/views/header.php:16
#: public/views/header.php:39
msgid "Menu"
msgstr ""

#: public/views/header.php:19
#: public/views/header.php:42
msgid "Howdy"
msgstr ""

#: public/views/header.php:22
#: public/views/header.php:45
msgid "Logout"
msgstr ""

Expand Down Expand Up @@ -414,7 +452,7 @@ msgstr ""
msgid "http://www.kilbot.com.au"
msgstr ""

#: public/includes/class-pos-checkout.php:44
#: public/includes/class-pos-checkout.php:48
msgctxt "Order date parsed by strftime"
msgid "%b %d, %Y @ %I:%M %p"
msgstr ""
Expand Down
18 changes: 13 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
{
"name": "woocommerce-pos",
"version": "0.3.0",
"dependencies": {},
"dependencies": {
"grunt-contrib-compass": "^0.8.0",
"grunt-contrib-cssmin": "^0.9.0",
"grunt-contrib-imagemin": "^0.7.1",
"grunt-contrib-uglify": "^0.4.0",
"grunt-wp-i18n": "^0.4.5",
"grunt-wp-readme-to-markdown": "^0.7.0",
"load-grunt-tasks": "^0.4.0"
},
"devDependencies": {
"grunt": "~0.4.4",
"grunt-contrib-compass": "^0.7.2",
"grunt-contrib-imagemin": "~0.6.1",
"grunt": "~0.4.5",
"grunt-contrib-compass": "^0.8.0",
"grunt-contrib-imagemin": "^0.7.1",
"grunt-contrib-cssmin": "~0.9.0",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-uglify": "~0.4.0",
Expand All @@ -18,4 +26,4 @@
"grunt-shell": "^0.7.0",
"grunt-po2mo": "^0.1.0"
}
}
}
2 changes: 1 addition & 1 deletion public/assets/js/pos.min.js

Large diffs are not rendered by default.

35 changes: 19 additions & 16 deletions public/assets/js/views/CartTotals.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ define(['underscore', 'backbone', 'accounting', 'views/Checkout', 'handlebars',
var customers = [];
_( data ).each( function( obj, id ) {
customers.push( obj );
})
});
return { results: customers };
}
},
Expand All @@ -76,7 +76,7 @@ define(['underscore', 'backbone', 'accounting', 'views/Checkout', 'handlebars',
}
},
formatInputTooLong: function( input, max ) {
var n = n = input.length - max;
var n = input.length - max;
if( n > 1 ) {
var str = self.params.select.too_longs;
return str.replace( "%d", n );
Expand All @@ -87,7 +87,7 @@ define(['underscore', 'backbone', 'accounting', 'views/Checkout', 'handlebars',
formatSelectionTooBig: function( limit ) {
if( limit > 1 ) {
var str = self.params.select.too_bigs;
return str.replace( "%d", n );
return str.replace( "%d", limit );
} else {
return self.params.select.too_big;
}
Expand All @@ -104,18 +104,18 @@ define(['underscore', 'backbone', 'accounting', 'views/Checkout', 'handlebars',

formatResult: function( customer, container, query ) {
var output = '';
if( ! _.isEmpty( customer.first_name ) ) output = customer.first_name + ' ';
if( ! _.isEmpty( customer.last_name ) ) output += customer.last_name + ' ';
if( output === '' ) output = customer.display_name + ' ';
if( ! _.isEmpty( customer.user_email ) ) output += '(' + customer.user_email + ')';
if( ! _.isEmpty( customer.first_name ) ) { output = customer.first_name + ' '; }
if( ! _.isEmpty( customer.last_name ) ) { output += customer.last_name + ' '; }
if( output === '' ) { output = customer.display_name + ' '; }
if( ! _.isEmpty( customer.user_email ) ) { output += '(' + customer.user_email + ')'; }
return output;
},

formatSelection: function( customer, container ) {
var output = '';
if( ! _.isEmpty( customer.first_name ) ) output = customer.first_name + ' ';
if( ! _.isEmpty( customer.last_name ) ) output += customer.last_name + ' ';
if( output === '' ) output = customer.display_name;
if( ! _.isEmpty( customer.first_name ) ) { output = customer.first_name + ' '; }
if( ! _.isEmpty( customer.last_name ) ) { output += customer.last_name + ' '; }
if( output === '' ) { output = customer.display_name; }
return output;
},

Expand All @@ -125,6 +125,8 @@ define(['underscore', 'backbone', 'accounting', 'views/Checkout', 'handlebars',
// if( !$(e.target).is('button') ) { return; }

var action = e.target.className.match(/\saction-([a-z]+)/);
var td;

if( !action ) { return; }

switch( action[1] ) {
Expand All @@ -134,12 +136,12 @@ define(['underscore', 'backbone', 'accounting', 'views/Checkout', 'handlebars',
break;
case 'note':
// toggle note row
var td = this.$('.note').show().children('td');
td = this.$('.note').show().children('td');
td.attr('contenteditable','true').focus();
break;
case 'discount':
// toggle discount row
var td = this.$('.order-discount').show().children('td');
td = this.$('.order-discount').show().children('td');
td.attr('contenteditable','true').text( td.data('value') ).selectText();
break;
case 'checkout':
Expand Down Expand Up @@ -170,22 +172,23 @@ define(['underscore', 'backbone', 'accounting', 'views/Checkout', 'handlebars',
},

save: function(e) {
var el = $(e.target);
var action = el.closest('tr').attr('class');
var el = $(e.target),
action = el.closest('tr').attr('class'),
value;

// bail if no className
if( !action ) { return; }

switch( action ) {
case 'note':
var value = el.text();
value = el.text();

// validate and save
this.model.save({ note: value });

break;
case 'order-discount':
var value = el.text();
value = el.text();

// if empty, go back to zero
if( value === '' ) { value = 0; }
Expand Down
2 changes: 1 addition & 1 deletion public/class-pos.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class WooCommerce_POS {
/**
* Development flag
*/
public $development = true;
public $development = false;

/**
* Unique identifier
Expand Down
23 changes: 23 additions & 0 deletions public/views/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,29 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="apple-mobile-web-app-capable" content="yes" />

<!-- For iPad with high-resolution Retina display running iOS ≥ 7: -->
<link rel="apple-touch-icon-precomposed" href="<?= WC_POS()->plugin_url ?>assets/favicon-152.png">
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="<?= WC_POS()->plugin_url ?>assets/favicon-152.png">

<!-- For iPad with high-resolution Retina display running iOS ≤ 6: -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="<?= WC_POS()->plugin_url ?>assets/favicon-144.png">

<!-- For iPhone with high-resolution Retina display running iOS ≥ 7: -->
<link rel="apple-touch-icon-precomposed" sizes="120x120" href="<?= WC_POS()->plugin_url ?>assets/favicon-120.png">

<!-- For iPhone with high-resolution Retina display running iOS ≤ 6: -->
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="<?= WC_POS()->plugin_url ?>assets/favicon-114.png">

<!-- For first- and second-generation iPad: -->
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="<?= WC_POS()->plugin_url ?>assets/favicon-72.png">

<!-- For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
<link rel="apple-touch-icon-precomposed" href="<?= WC_POS()->plugin_url ?>assets/favicon-57.png">

<!-- IE 10 Metro tile icon -->
<meta name="msapplication-TileColor" content="#323A46">
<meta name="msapplication-TileImage" content="<?= WC_POS()->plugin_url ?>assets/favicon-144.png">

<?php WooCommerce_POS::pos_print_css(); ?>
<?php WooCommerce_POS::pos_print_js('head'); ?>

Expand Down
6 changes: 2 additions & 4 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: kilbot
Tags: cart, e-commerce, ecommerce, inventory, point-of-sale, pos, sales, sell, shop, shopify, store, vend, woocommerce, wordpress-ecommerce
Requires at least: 3.8
Tested up to: 3.9
Stable tag: 0.2.15
Stable tag: 0.3
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -61,13 +61,11 @@ Bugs can be reported on the [WooCommerce POS GitHub repository](https://github.c
== Changelog ==

= 0.3 =
TODO: everytime a parent is updated, the variatants need a update bump
TODO: sync products after each sale
TODO: new apple touch icons
* New: Set default POS customer on new settings page
* New: Add customer to order
* New: Documentation for third party developers [http://kilbot.github.io/WooCommerce-POS/](http://kilbot.github.io/WooCommerce-POS/)
* New: pt_BR translation thanks to Hermes Alves Dias Souza! [http://pt.woopos.com.au/pos](http://pt.woopos.com.au/pos)
* New: Icons for mobile devices. Thanks [@sixthcore](https://github.com/kilbot/WooCommerce-POS/issues/11)!
* Fix: stock is now synced after each order
* Fix: Add-to-cart bug for particular tax settings (tax enabled + prices exclusive from tax + no tax rates set)
* Fix: product display for sites where home_url != site_url
Expand Down

0 comments on commit acc3ea5

Please sign in to comment.