spree_core 2.4.0.rc2 → 2.4.0.rc3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (81) hide show
  1. checksums.yaml +4 -4
  2. data/app/helpers/spree/products_helper.rb +7 -8
  3. data/app/models/spree/adjustment.rb +7 -2
  4. data/app/models/spree/classification.rb +1 -1
  5. data/app/models/spree/exchange.rb +4 -0
  6. data/app/models/spree/gateway/bogus.rb +3 -2
  7. data/app/models/spree/inventory_unit.rb +1 -1
  8. data/app/models/spree/item_adjustments.rb +7 -3
  9. data/app/models/spree/line_item.rb +5 -0
  10. data/app/models/spree/order.rb +3 -3
  11. data/app/models/spree/order_contents.rb +11 -14
  12. data/app/models/spree/payment.rb +7 -3
  13. data/app/models/spree/payment_method/check.rb +2 -0
  14. data/app/models/spree/payment_method.rb +5 -1
  15. data/app/models/spree/product.rb +11 -8
  16. data/app/models/spree/promotion/actions/create_item_adjustments.rb +3 -2
  17. data/app/models/spree/promotion/actions/create_line_items.rb +1 -0
  18. data/app/models/spree/promotion.rb +2 -2
  19. data/app/models/spree/promotion_handler/coupon.rb +5 -1
  20. data/app/models/spree/property.rb +0 -7
  21. data/app/models/spree/prototype.rb +1 -0
  22. data/app/models/spree/reimbursement.rb +1 -1
  23. data/app/models/spree/reimbursement_tax_calculator.rb +7 -1
  24. data/app/models/spree/return_authorization.rb +1 -1
  25. data/app/models/spree/shipping_category.rb +2 -2
  26. data/app/models/spree/shipping_method_category.rb +1 -1
  27. data/app/models/spree/stock/package.rb +6 -0
  28. data/app/models/spree/stock_item.rb +2 -2
  29. data/app/models/spree/stock_location.rb +1 -1
  30. data/app/models/spree/store.rb +1 -1
  31. data/app/models/spree/tax_category.rb +2 -2
  32. data/app/models/spree/tax_rate.rb +7 -4
  33. data/app/models/spree/taxon.rb +7 -3
  34. data/app/models/spree/variant.rb +5 -5
  35. data/app/models/spree/zone.rb +15 -17
  36. data/app/models/spree/zone_member.rb +1 -1
  37. data/config/initializers/user_class_extensions.rb +10 -9
  38. data/config/locales/en.yml +1 -0
  39. data/db/default/spree/countries.rb +18 -231
  40. data/db/default/spree/states.rb +16 -76
  41. data/db/development.sqlite +0 -0
  42. data/db/migrate/20130213191427_create_default_stock.rb +4 -1
  43. data/db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb +3 -5
  44. data/db/migrate/20140717185932_add_default_to_spree_stock_locations.rb +3 -1
  45. data/db/migrate/20141012083513_create_spree_taxons_prototypes.rb +8 -0
  46. data/db/migrate/20141021194502_add_state_lock_version_to_order.rb +5 -0
  47. data/db/migrate/20141023005240_add_counter_cache_from_spree_variants_to_spree_stock_items.rb +13 -0
  48. data/db/migrate/20141101231208_fix_adjustment_order_presence.rb +13 -0
  49. data/db/migrate/20141105213646_update_classifications_positions.rb +9 -0
  50. data/lib/generators/spree/install/install_generator.rb +3 -7
  51. data/lib/spree/core/controller_helpers/order.rb +5 -6
  52. data/lib/spree/core/importer/order.rb +16 -3
  53. data/lib/spree/core/search/base.rb +1 -1
  54. data/lib/spree/core/validators/email.rb +1 -1
  55. data/lib/spree/core/version.rb +1 -1
  56. data/lib/spree/migrations.rb +7 -3
  57. data/lib/spree/permitted_attributes.rb +3 -1
  58. data/lib/spree/testing_support/ability_helpers.rb +25 -25
  59. data/lib/spree/testing_support/capybara_ext.rb +2 -2
  60. data/lib/spree/testing_support/factories/customer_return_factory.rb +1 -1
  61. data/lib/spree/testing_support/factories/line_item_factory.rb +1 -1
  62. data/lib/spree/testing_support/factories/order_factory.rb +2 -2
  63. data/lib/spree/testing_support/factories/product_factory.rb +6 -0
  64. data/lib/spree/testing_support/factories/promotion_factory.rb +3 -3
  65. data/lib/spree/testing_support/factories/reimbursement_factory.rb +1 -1
  66. data/lib/spree/testing_support/factories/stock_factory.rb +3 -3
  67. data/lib/spree/testing_support/flash.rb +2 -2
  68. metadata +30 -17
  69. data/vendor/assets/javascripts/jquery.validate/localization/messages_et.js +0 -23
  70. data/vendor/assets/javascripts/jquery.validate/localization/messages_eu.js +0 -25
  71. data/vendor/assets/javascripts/jquery.validate/localization/messages_hr.js +0 -25
  72. data/vendor/assets/javascripts/jquery.validate/localization/messages_ka.js +0 -25
  73. data/vendor/assets/javascripts/jquery.validate/localization/messages_ko.js +0 -25
  74. data/vendor/assets/javascripts/jquery.validate/localization/messages_my.js +0 -25
  75. data/vendor/assets/javascripts/jquery.validate/localization/messages_pt_BR.js +0 -26
  76. data/vendor/assets/javascripts/jquery.validate/localization/messages_pt_PT.js +0 -26
  77. data/vendor/assets/javascripts/jquery.validate/localization/messages_sl.js +0 -25
  78. data/vendor/assets/javascripts/jquery.validate/localization/messages_sv.js +0 -23
  79. data/vendor/assets/javascripts/jquery.validate/localization/messages_uk.js +0 -25
  80. data/vendor/assets/javascripts/jquery.validate/localization/messages_zh.js +0 -25
  81. data/vendor/assets/javascripts/jquery.validate/localization/messages_zh_TW.js +0 -26
@@ -1,25 +0,0 @@
1
- /*
2
- * Translated default messages for the jQuery validation plugin.
3
- * Locale: MY (Malay; Melayu)
4
- */
5
- (function ($) {
6
- $.extend($.validator.messages, {
7
- required: "Medan ini diperlukan.",
8
- remote: "Sila betulkan medan ini.",
9
- email: "Sila masukkan alamat emel yang betul.",
10
- url: "Sila masukkan URL yang betul.",
11
- date: "Sila masukkan tarikh yang betul.",
12
- dateISO: "Sila masukkan tarikh(ISO) yang betul.",
13
- number: "Sila masukkan nombor yang betul.",
14
- digits: "Sila masukkan nilai digit sahaja.",
15
- creditcard: "Sila masukkan nombor kredit kad yang betul.",
16
- equalTo: "Sila masukkan nilai yang sama semula.",
17
- accept: "Sila masukkan nilai yang telah diterima.",
18
- maxlength: $.validator.format("Sila masukkan nilai tidak lebih dari {0} aksara."),
19
- minlength: $.validator.format("Sila masukkan nilai sekurang-kurangnya {0} aksara."),
20
- rangelength: $.validator.format("Sila masukkan panjang nilai antara {0} dan {1} aksara."),
21
- range: $.validator.format("Sila masukkan nilai antara {0} dan {1} aksara."),
22
- max: $.validator.format("Sila masukkan nilai yang kurang atau sama dengan {0}."),
23
- min: $.validator.format("Sila masukkan nilai yang lebih atau sama dengan {0}.")
24
- });
25
- }(jQuery));
@@ -1,26 +0,0 @@
1
- /*
2
- * Translated default messages for the jQuery validation plugin.
3
- * Locale: PT (Portuguese; português)
4
- * Region: BR (Brazil)
5
- */
6
- (function ($) {
7
- $.extend($.validator.messages, {
8
- required: "Este campo é requerido.",
9
- remote: "Por favor, corrija este campo.",
10
- email: "Por favor, forneça um endereço eletrônico válido.",
11
- url: "Por favor, forneça uma URL válida.",
12
- date: "Por favor, forneça uma data válida.",
13
- dateISO: "Por favor, forneça uma data válida (ISO).",
14
- number: "Por favor, forneça um número válido.",
15
- digits: "Por favor, forneça somente dígitos.",
16
- creditcard: "Por favor, forneça um cartão de crédito válido.",
17
- equalTo: "Por favor, forneça o mesmo valor novamente.",
18
- accept: "Por favor, forneça um valor com uma extensão válida.",
19
- maxlength: $.validator.format("Por favor, forneça não mais que {0} caracteres."),
20
- minlength: $.validator.format("Por favor, forneça ao menos {0} caracteres."),
21
- rangelength: $.validator.format("Por favor, forneça um valor entre {0} e {1} caracteres de comprimento."),
22
- range: $.validator.format("Por favor, forneça um valor entre {0} e {1}."),
23
- max: $.validator.format("Por favor, forneça um valor menor ou igual a {0}."),
24
- min: $.validator.format("Por favor, forneça um valor maior ou igual a {0}.")
25
- });
26
- }(jQuery));
@@ -1,26 +0,0 @@
1
- /*
2
- * Translated default messages for the jQuery validation plugin.
3
- * Locale: PT (Portuguese; português)
4
- * Region: PT (Portugal)
5
- */
6
- (function ($) {
7
- $.extend($.validator.messages, {
8
- required: "Campo de preenchimento obrigatório.",
9
- remote: "Por favor, corrija este campo.",
10
- email: "Por favor, introduza um endereço eletrónico válido.",
11
- url: "Por favor, introduza um URL válido.",
12
- date: "Por favor, introduza uma data válida.",
13
- dateISO: "Por favor, introduza uma data válida (ISO).",
14
- number: "Por favor, introduza um número válido.",
15
- digits: "Por favor, introduza apenas dígitos.",
16
- creditcard: "Por favor, introduza um número de cartão de crédito válido.",
17
- equalTo: "Por favor, introduza de novo o mesmo valor.",
18
- accept: "Por favor, introduza um ficheiro com uma extensão válida.",
19
- maxlength: $.validator.format("Por favor, não introduza mais do que {0} caracteres."),
20
- minlength: $.validator.format("Por favor, introduza pelo menos {0} caracteres."),
21
- rangelength: $.validator.format("Por favor, introduza entre {0} e {1} caracteres."),
22
- range: $.validator.format("Por favor, introduza um valor entre {0} e {1}."),
23
- max: $.validator.format("Por favor, introduza um valor menor ou igual a {0}."),
24
- min: $.validator.format("Por favor, introduza um valor maior ou igual a {0}.")
25
- });
26
- }(jQuery));
@@ -1,25 +0,0 @@
1
- /*
2
- * Translated default messages for the jQuery validation plugin.
3
- * Language: SL (Slovenian; slovenski jezik)
4
- */
5
- (function ($) {
6
- $.extend($.validator.messages, {
7
- required: "To polje je obvezno.",
8
- remote: "Prosimo popravite to polje.",
9
- email: "Prosimo vnesite veljaven email naslov.",
10
- url: "Prosimo vnesite veljaven URL naslov.",
11
- date: "Prosimo vnesite veljaven datum.",
12
- dateISO: "Prosimo vnesite veljaven ISO datum.",
13
- number: "Prosimo vnesite veljavno število.",
14
- digits: "Prosimo vnesite samo števila.",
15
- creditcard: "Prosimo vnesite veljavno številko kreditne kartice.",
16
- equalTo: "Prosimo ponovno vnesite vrednost.",
17
- accept: "Prosimo vnesite vrednost z veljavno končnico.",
18
- maxlength: $.validator.format("Prosimo vnesite največ {0} znakov."),
19
- minlength: $.validator.format("Prosimo vnesite najmanj {0} znakov."),
20
- rangelength: $.validator.format("Prosimo vnesite najmanj {0} in največ {1} znakov."),
21
- range: $.validator.format("Prosimo vnesite vrednost med {0} in {1}."),
22
- max: $.validator.format("Prosimo vnesite vrednost manjše ali enako {0}."),
23
- min: $.validator.format("Prosimo vnesite vrednost večje ali enako {0}.")
24
- });
25
- }(jQuery));
@@ -1,23 +0,0 @@
1
- /*
2
- * Translated default messages for the jQuery validation plugin.
3
- * Locale: SV (Swedish; Svenska)
4
- */
5
- (function ($) {
6
- $.extend($.validator.messages, {
7
- required: "Detta fält är obligatoriskt.",
8
- maxlength: $.validator.format("Du får ange högst {0} tecken."),
9
- minlength: $.validator.format("Du måste ange minst {0} tecken."),
10
- rangelength: $.validator.format("Ange minst {0} och max {1} tecken."),
11
- email: "Ange en korrekt e-postadress.",
12
- url: "Ange en korrekt URL.",
13
- date: "Ange ett korrekt datum.",
14
- dateISO: "Ange ett korrekt datum (ÅÅÅÅ-MM-DD).",
15
- number: "Ange ett korrekt nummer.",
16
- digits: "Ange endast siffror.",
17
- equalTo: "Ange samma värde igen.",
18
- range: $.validator.format("Ange ett värde mellan {0} och {1}."),
19
- max: $.validator.format("Ange ett värde som är mindre eller lika med {0}."),
20
- min: $.validator.format("Ange ett värde som är större eller lika med {0}."),
21
- creditcard: "Ange ett korrekt kreditkortsnummer."
22
- });
23
- }(jQuery));
@@ -1,25 +0,0 @@
1
- /*
2
- * Translated default messages for the jQuery validation plugin.
3
- * Locale: UK (Ukrainian; українська мова)
4
- */
5
- (function ($) {
6
- $.extend($.validator.messages, {
7
- required: "Це поле необхідно заповнити.",
8
- remote: "Будь ласка, введіть правильне значення.",
9
- email: "Будь ласка, введіть коректну адресу електронної пошти.",
10
- url: "Будь ласка, введіть коректний URL.",
11
- date: "Будь ласка, введіть коректну дату.",
12
- dateISO: "Будь ласка, введіть коректну дату у форматі ISO.",
13
- number: "Будь ласка, введіть число.",
14
- digits: "Вводите потрібно лише цифри.",
15
- creditcard: "Будь ласка, введіть правильний номер кредитної карти.",
16
- equalTo: "Будь ласка, введіть таке ж значення ще раз.",
17
- accept: "Будь ласка, виберіть файл з правильним розширенням.",
18
- maxlength: $.validator.format("Будь ласка, введіть не більше {0} символів."),
19
- minlength: $.validator.format("Будь ласка, введіть не менше {0} символів."),
20
- rangelength: $.validator.format("Будь ласка, введіть значення довжиною від {0} до {1} символів."),
21
- range: $.validator.format("Будь ласка, введіть число від {0} до {1}."),
22
- max: $.validator.format("Будь ласка, введіть число, менше або рівно {0}."),
23
- min: $.validator.format("Будь ласка, введіть число, більше або рівно {0}.")
24
- });
25
- }(jQuery));
@@ -1,25 +0,0 @@
1
- /*
2
- * Translated default messages for the jQuery validation plugin.
3
- * Locale: ZH (Chinese, 中文 (Zhōngwén), 汉语, 漢語)
4
- */
5
- (function ($) {
6
- $.extend($.validator.messages, {
7
- required: "必选字段",
8
- remote: "请修正该字段",
9
- email: "请输入正确格式的电子邮件",
10
- url: "请输入合法的网址",
11
- date: "请输入合法的日期",
12
- dateISO: "请输入合法的日期 (ISO).",
13
- number: "请输入合法的数字",
14
- digits: "只能输入整数",
15
- creditcard: "请输入合法的信用卡号",
16
- equalTo: "请再次输入相同的值",
17
- accept: "请输入拥有合法后缀名的字符串",
18
- maxlength: $.validator.format("请输入一个长度最多是 {0} 的字符串"),
19
- minlength: $.validator.format("请输入一个长度最少是 {0} 的字符串"),
20
- rangelength: $.validator.format("请输入一个长度介于 {0} 和 {1} 之间的字符串"),
21
- range: $.validator.format("请输入一个介于 {0} 和 {1} 之间的值"),
22
- max: $.validator.format("请输入一个最大为 {0} 的值"),
23
- min: $.validator.format("请输入一个最小为 {0} 的值")
24
- });
25
- }(jQuery));
@@ -1,26 +0,0 @@
1
- /*
2
- * Translated default messages for the jQuery validation plugin.
3
- * Locale: ZH (Chinese; 中文 (Zhōngwén), 汉语, 漢語)
4
- * Region: TW (Taiwan)
5
- */
6
- (function ($) {
7
- $.extend($.validator.messages, {
8
- required: "必填",
9
- remote: "請修正此欄位",
10
- email: "請輸入正確的電子信箱",
11
- url: "請輸入合法的URL",
12
- date: "請輸入合法的日期",
13
- dateISO: "請輸入合法的日期 (ISO).",
14
- number: "請輸入數字",
15
- digits: "請輸入整數",
16
- creditcard: "請輸入合法的信用卡號碼",
17
- equalTo: "請重複輸入一次",
18
- accept: "請輸入有效的後缀字串",
19
- maxlength: $.validator.format("請輸入長度不大於{0} 的字串"),
20
- minlength: $.validator.format("請輸入長度不小於 {0} 的字串"),
21
- rangelength: $.validator.format("請輸入長度介於 {0} 和 {1} 之間的字串"),
22
- range: $.validator.format("請輸入介於 {0} 和 {1} 之間的數值"),
23
- max: $.validator.format("請輸入不大於 {0} 的數值"),
24
- min: $.validator.format("請輸入不小於 {0} 的數值")
25
- });
26
- }(jQuery));