office_clerk 0.8 → 0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (120) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +6 -2
  3. data/Gemfile.lock +159 -100
  4. data/Guardfile +3 -0
  5. data/README.md +7 -2
  6. data/Rakefile +9 -0
  7. data/app/assets/images/missing_list.png +0 -0
  8. data/app/assets/images/missing_product.png +0 -0
  9. data/app/assets/images/missing_thumb.png +0 -0
  10. data/app/assets/javascripts/office_clerk.js +7 -5
  11. data/app/assets/stylesheets/office_clerk.css.scss +89 -14
  12. data/app/controllers/baskets_controller.rb +37 -26
  13. data/app/controllers/orders_controller.rb +44 -29
  14. data/app/controllers/products_controller.rb +6 -6
  15. data/app/controllers/purchases_controller.rb +18 -8
  16. data/app/helpers/admin_helper.rb +16 -21
  17. data/app/helpers/baskets_helper.rb +31 -0
  18. data/app/helpers/categories_helper.rb +3 -0
  19. data/app/helpers/office_helper.rb +34 -7
  20. data/app/helpers/orders_helper.rb +2 -3
  21. data/app/models/basket.rb +46 -20
  22. data/app/models/clerk.rb +6 -1
  23. data/app/models/item.rb +7 -0
  24. data/app/models/order.rb +18 -6
  25. data/app/models/product.rb +23 -8
  26. data/app/views/addresses/show.html.haml +2 -2
  27. data/app/views/baskets/_small.html.haml +2 -2
  28. data/app/views/baskets/edit.html.haml +19 -16
  29. data/app/views/baskets/index.html.haml +13 -5
  30. data/app/views/baskets/show.html.haml +3 -3
  31. data/app/views/categories/_treeview.html.haml +1 -2
  32. data/app/views/categories/edit.html.haml +4 -5
  33. data/app/views/categories/index.html.haml +7 -7
  34. data/app/views/categories/show.html.haml +3 -4
  35. data/app/views/clerks/edit.html.haml +4 -3
  36. data/app/views/clerks/index.html.haml +6 -6
  37. data/app/views/clerks/show.html.haml +3 -3
  38. data/app/views/layouts/_admin_menu.html.haml +8 -8
  39. data/app/views/layouts/_messages.html.haml +2 -2
  40. data/app/views/layouts/office_clerk.haml +10 -27
  41. data/app/views/order_mailer/confirm.text.erb +1 -2
  42. data/app/views/order_mailer/shipped.text.erb +2 -1
  43. data/app/views/orders/index.csv.erb +6 -6
  44. data/app/views/orders/index.html.haml +25 -20
  45. data/app/views/orders/shipment.haml +57 -0
  46. data/app/views/orders/show.html.haml +106 -39
  47. data/app/views/products/_head.haml +1 -2
  48. data/app/views/products/_line.html.haml +1 -1
  49. data/app/views/products/_preview_box.haml +14 -10
  50. data/app/views/products/_triple.html.haml +1 -1
  51. data/app/views/products/edit.html.haml +4 -4
  52. data/app/views/products/index.html.haml +24 -13
  53. data/app/views/products/show.html.haml +15 -12
  54. data/app/views/purchases/index.html.haml +11 -7
  55. data/app/views/purchases/show.html.haml +42 -25
  56. data/app/views/sessions/sign_up.haml +10 -10
  57. data/app/views/suppliers/edit.html.haml +2 -2
  58. data/app/views/suppliers/index.html.haml +6 -7
  59. data/app/views/suppliers/show.html.haml +2 -3
  60. data/config/i18n-tasks.yml +97 -0
  61. data/config/initializers/migrate.rb +11 -1
  62. data/config/initializers/paperclip.rb +17 -0
  63. data/config/locales/config.yml +0 -1
  64. data/config/locales/en.yml +99 -116
  65. data/config/locales/fi.yml +101 -117
  66. data/config/routes.rb +18 -15
  67. data/db/migrate/20131226143612_categories.rb +2 -2
  68. data/db/migrate/20131226151332_products.rb +3 -3
  69. data/lib/office_clerk/engine.rb +5 -8
  70. data/lib/office_clerk/shipping_method.rb +12 -1
  71. data/lib/office_clerk/version.rb +1 -1
  72. data/office_clerk.gemspec +5 -5
  73. data/spec/controllers/baskets_controller_spec.rb +2 -2
  74. data/spec/controllers/orders_controller_spec.rb +0 -29
  75. data/spec/controllers/products_controller_spec.rb +4 -3
  76. data/spec/controllers/purchases_controller_spec.rb +3 -4
  77. data/spec/factories/orders.rb +6 -1
  78. data/spec/factories/products.rb +3 -0
  79. data/spec/features/baskets/edit_spec.rb +6 -1
  80. data/spec/features/baskets/index_spec.rb +1 -0
  81. data/spec/features/baskets/search_spec.rb +1 -1
  82. data/spec/features/orders/filter_spec.rb +19 -0
  83. data/spec/features/orders/inventory_spec.rb +19 -0
  84. data/spec/features/orders/ordering_spec.rb +84 -0
  85. data/spec/features/paginate_spec.rb +11 -0
  86. data/spec/features/sessions_spec.rb +2 -1
  87. data/spec/{models/locale_spec.rb → i18n_spec.rb} +19 -1
  88. data/spec/mailers/order_mailer_spec.rb +2 -1
  89. data/spec/models/baskets/inventory_spec.rb +9 -2
  90. data/spec/models/baskets/items_spec.rb +6 -1
  91. data/spec/models/order_spec.rb +20 -1
  92. data/spec/routing/baskets_routing_spec.rb +5 -1
  93. data/spec/routing/orders_routing_spec.rb +0 -12
  94. data/spec/spec_helper.rb +16 -3
  95. data/test_app/bin/setup +29 -0
  96. data/test_app/config/application.rb +3 -0
  97. data/test_app/config/boot.rb +1 -2
  98. data/test_app/config/environment.rb +1 -1
  99. data/test_app/config/environments/development.rb +1 -1
  100. data/test_app/config/environments/production.rb +20 -21
  101. data/test_app/config/environments/test.rb +7 -4
  102. data/test_app/config/initializers/assets.rb +11 -0
  103. data/test_app/config/initializers/cookies_serializer.rb +3 -0
  104. data/test_app/config/initializers/mime_types.rb +0 -1
  105. data/test_app/config/initializers/session_store.rb +1 -1
  106. data/test_app/config/routes.rb +1 -2
  107. data/test_app/config/secrets.yml +22 -0
  108. data/test_app/db/migrate/20141114205526_suppliers.office.rb +1 -1
  109. data/test_app/db/migrate/20141114205527_categories.office.rb +3 -3
  110. data/test_app/db/migrate/20141114205528_items.office.rb +1 -1
  111. data/test_app/db/migrate/20141114205529_orders.office.rb +1 -1
  112. data/test_app/db/migrate/20141114205530_baskets.office.rb +1 -1
  113. data/test_app/db/migrate/20141114205531_purchases.office.rb +1 -1
  114. data/test_app/db/migrate/20141114205532_products.office.rb +4 -4
  115. data/test_app/db/schema.rb +26 -26
  116. metadata +35 -28
  117. data/app/views/orders/edit.html.haml +0 -25
  118. data/app/views/orders/ship.haml +0 -91
  119. data/app/views/purchases/edit.html.haml +0 -9
  120. data/spec/features/orders_spec.rb +0 -37
data/config/initializers/migrate.rb CHANGED
@@ -1,8 +1,18 @@
1
+ # coding: utf-8
1
2
  # poor mans migration.
2
3
  # Trying to keep the schema clean until version 1
3
4
 
4
- unless Rails.env.test?
5
+ if ActiveRecord::Base.connection.table_exists? :orders
6
+ #order paid_amount
7
+ # order all times to datetime
8
+ #product position
5
9
  unless Order.columns_hash["note"]
6
10
  ActiveRecord::Base.connection.add_column :orders, :note, :string , :default => ""
7
11
  end
12
+ end
13
+ if ActiveRecord::Base.connection.table_exists? :purchases
14
+ #purchase should have email
15
+ Purchase.where(:name => nil).each do |p|
16
+ p.update_attribute(:name , "Sisäänosto #{I18n.l(p.created_at.to_date)}")
17
+ end
8
18
  end
data/config/initializers/paperclip.rb ADDED
@@ -0,0 +1,17 @@
1
+ # this little trick moves the missing styles to the assets
2
+ # so when you update them, they actually update in the client
3
+ Paperclip.interpolates(:placeholder) do |attachment, style|
4
+ basename = "missing_#{style}.png"
5
+ # some weird sprockets change makes this neccessary
6
+ # but it should work on older versions too
7
+ if Rails.env.production?
8
+ ActionController::Base.helpers.asset_path(basename)
9
+ else
10
+ basename
11
+ end
12
+ end
13
+ Paperclip::Attachment.default_options[:default_url] = ":placeholder"
14
+
15
+ Paperclip::Attachment.default_options[:styles] = {:thumb => '48x48>', :list => '150x150>', :product => '600x600>' }
16
+ Paperclip::Attachment.default_options[:default_style] = :list
17
+ Paperclip::Attachment.default_options[:url] = "/images/:id/:style/:basename.:extension"
data/config/locales/config.yml CHANGED
@@ -5,6 +5,5 @@ config:
5
5
  name: Nouto myymälästämme
6
6
  defaults:
7
7
  tax: 24.0
8
- free_shipping: 100
9
8
  print_styles: ""
10
9
  mail_buttons: "confirm cancel paid shipped"
data/config/locales/en.yml CHANGED
@@ -1,41 +1,106 @@
1
1
  ---
2
2
  en:
3
- empty: Empty
4
- online_eq: Online?
5
3
  actions: Actions
4
+ activerecord:
5
+ attributes:
6
+ basket:
7
+ created_at: Created
8
+ total_price: Price
9
+ type: Type
10
+ category:
11
+ category: Parent
12
+ description: Description
13
+ link: Link
14
+ name: Name
15
+ online: Online
16
+ position: Position
17
+ summary: Summary
18
+ clerk:
19
+ city: City
20
+ email: Email
21
+ name: Name
22
+ password: Passord
23
+ password_confirmation: Password confirmation
24
+ phone: Phone
25
+ street: Street
26
+ order:
27
+ canceled_on: Canceled on
28
+ city: Postcode and city
29
+ email: Email
30
+ name: Full name
31
+ note: Note
32
+ number: Order number
33
+ ordered_on: Ordered on
34
+ paid_on: Paid on
35
+ password: Passord
36
+ password_confirmation: Password confirmation
37
+ phone: Phonenumber
38
+ shipped_on: Shipped on
39
+ street: Street and number
40
+ total: Total
41
+ product:
42
+ category: Category
43
+ cost: Cost
44
+ description: Description
45
+ ean: Ean
46
+ inventory: Inventory
47
+ name: Name
48
+ online: online
49
+ price: Price
50
+ scode: Supplier code
51
+ stock_level: Stock aim
52
+ summary: Summary
53
+ supplier: Suppier
54
+ tax: Tax rate
55
+ weight: Weight
56
+ purchase:
57
+ name: Name
58
+ ordered_on: Ordered on
59
+ received_on: Received on
60
+ supplier:
61
+ city: City
62
+ name: Name
63
+ phone: Phone
64
+ street: Street
65
+ supplier_name: Supplier
66
+ models:
67
+ basket: Cart
68
+ category: Product group
69
+ clerk: User
70
+ order: Order
71
+ product: Product
72
+ purchase: Purchase
73
+ supplier: Supplier
6
74
  add: Add
7
- add_inventory: Add Inventory
8
75
  add_to_basket: Add to basket
9
76
  address: Adress
10
- addresses: Adresses
11
77
  admin: Admin
12
78
  are_you_sure: Are you sure?
13
- as_inventory: As Inventory
14
79
  back: Back
15
80
  basket: Basket
16
81
  basket_empty: Basket is empty
17
- basket_locked: Basket is locked, unlock to change
82
+ basket_locked: Basket is locked, cancel to change
18
83
  baskets: Baskets
19
- between: ' between'
20
84
  blanks: Blanks
21
85
  cancel: Cancel
86
+ cancel_confirmation: Cancelling will return stock and zero shipment date. You can then delete the order or keep editing.
22
87
  canceled_on: Canceled on
23
- cancel_order_button: Cancel email
24
88
  categories: Product Categories
25
89
  category: Product Category
26
- choose_product_for_basket: Choose product for basket
27
90
  checkout: Checkout
91
+ choose_product_for_basket: Choose product for basket
92
+ choose_shipment: Choose shipment
28
93
  city: City
29
94
  clerk: User
30
95
  clerks: Users
31
- confirm_order_button: Send Confirmation Email
32
96
  contact: Contact
97
+ contact_details: Contact details
33
98
  cost: Cost
34
99
  count: Count
35
100
  country: Country
36
- create: Create
101
+ create: Luo
37
102
  create_success: Successfully created
38
- created_at: Created
103
+ customer: Customer
39
104
  delete: Delete
40
105
  deleted: Deleted
41
106
  description: Description
@@ -43,71 +108,60 @@ en:
43
108
  discount: Discount
44
109
  ean: Ean
45
110
  edit: Edit
46
- editing: Editing
47
111
  email: Email
48
112
  error: Error
49
113
  extra_picture: Extra picture
50
114
  filter: Filter
51
115
  first_name: First Name
52
116
  fix_errors: There are errors below
53
- history: Order history
54
- home: Home
55
- info: Info
56
117
  inventorized: Inventorized
57
118
  inventory: Inventory
58
- item: Item
59
119
  item_removed: Item removed
60
120
  items: Items
61
121
  last_name: Last Name
62
122
  link: Link
123
+ locked: Locked
63
124
  made_offline: taken offline
64
125
  made_online: made online
65
- manage: Manage
66
126
  main_picture: Main Picture
67
127
  make_order: Make Order
68
128
  make_purchase: Make Purchase
129
+ manage: Manage
69
130
  may_be_blank: May be blank
70
131
  name: Name
71
132
  name_contains: Name contains
72
133
  new: New
73
134
  new_item: New product item
74
- next: Next
135
+ nolla: Zero prices
75
136
  not_online: not online
76
137
  note: Note
77
- notice: Notice
78
138
  online: Online
79
139
  order: Order
80
- order_number: Number
81
- order_more_for_free_shipping: "Order %{more} € for free shipping"
82
- order_total: Order total
140
+ order_actions: Actions
141
+ order_button:
142
+ cancel: Cancel email
143
+ confirm: Send Confirmation Email
144
+ paid: Paid Mail
145
+ shipped: Ship Order Email
146
+ order_mail: Send email
147
+ order_number: Order Number
148
+ order_print: Print
83
149
  ordered: Ordered
84
150
  ordered_on: Ordered On
85
151
  orders: Orders
86
- our_shop: Our shop
87
152
  paid: Paid
88
153
  paid_on: Paid on
89
- paid_order_button: Paid Mail
90
- parent: Parent
91
154
  password: Password
155
+ payment_info: Payment info
92
156
  phone: Phone
93
157
  picture: Picture
94
- picture2: Picture 2
95
- position: Position
96
- prev: Previous
97
158
  preview: Preview
98
159
  price: Price
99
- price_between: Price between
100
- print: Print
101
- print_invoice: Print Invoice
102
- print_order: Print Order
103
- print_reminder: Print Reminder
104
- print_slip: Print Package Slip
105
- print_receipt: Print Receipt
106
160
  product: Product
107
161
  product_added: Product added
162
+ product_has_inventory: Product has inventory
108
163
  product_item: Product Item
109
164
  product_line: Product Line
110
- product_line_has_inventory: Product Line has inventori
111
165
  products: Products
112
166
  purchase: Purchase
113
167
  purchases: Purchases
@@ -116,13 +170,13 @@ en:
116
170
  received: Received
117
171
  received_on: Received On
118
172
  scode: Supplier code
119
- select: Select
120
173
  search: Search
174
+ select: Select
121
175
  ship: Ship
176
+ shipment_info: Shipment info
122
177
  shipment_price: Shipment price
123
178
  shipment_type: Shipment type
124
179
  shipped_on: Shipped on
125
- shipped_order_button: Ship Order Email
126
180
  shop: Shop
127
181
  shop_link: In Shop
128
182
  show: Show
@@ -131,97 +185,26 @@ en:
131
185
  sign_out: Log out
132
186
  sign_up: Sign up
133
187
  signed_in: Logged in
134
- signed_up: Signed up
135
188
  signed_out: Logged out
136
- state: State
189
+ signed_up: Signed up
190
+ stock_level: Stock aim
137
191
  street: Street
138
192
  street1: Street1
139
193
  street2: Street2
194
+ summary: Summary
140
195
  supplier: Supplier
141
196
  suppliers: Suppliers
142
- summary: Summary
143
- tax: Vat
144
197
  tax_percent: Tax percent
145
- tax_rate: Vat rate
146
- terms: Terms
147
198
  to_order: To order
148
199
  to_purchase: To purchase
149
- to_product: To product
150
200
  total: Total
151
201
  total_price: Total Price
152
202
  total_tax: Taxes
153
- treeview: Treeview
154
- type: Type
203
+ update: Update
155
204
  update_success: Successfully updated
156
- updated: Updated
157
205
  vat: Vat
158
206
  weight: Weight
159
207
  will_paginate:
160
208
  next_label: Next →
161
- page_gap: '…'
162
- previous_label: '← Previous'
163
- activerecord:
164
- attributes:
165
- basket:
166
- type: Type
167
- created_at: Created
168
- total_price: Price
169
- clerk:
170
- city: City
171
- email: Email
172
- name: Name
173
- password: Passord
174
- password_confirmation: Password confirmation
175
- phone: Phone
176
- street: Street
177
- category:
178
- name: Name
179
- online: Online
180
- category: Parent
181
- link: Link
182
- position: Position
183
- description: Description
184
- summary: Summary
185
- order:
186
- total: Total
187
- paid_on: Paid on
188
- shipped_on: Shipped on
189
- canceled_on: Canceled on
190
- note: Note
191
- email: Email
192
- ordered_on: Ordered on
193
- password: Passord
194
- password_confirmation: Password confirmation
195
- purchase:
196
- name: Name
197
- ordered_on: Ordered on
198
- received_on: Received on
199
- product:
200
- description: Description
201
- summary: Summary
202
- ean: Ean
203
- inventory: Inventory
204
- name: Name
205
- online: online
206
- price: Price
207
- scode: Supplier code
208
- tax: Tax rate
209
- weight: Weight
210
- cost: Cost
211
- supplier: Suppier
212
- category: Category
213
- name: Name
214
- supplier:
215
- city: City
216
- name: Name
217
- phone: Phone
218
- street: Street
219
- supplier_name: Supplier
220
- models:
221
- basket: Cart
222
- category: Product group
223
- clerk: User
224
- order: Order
225
- product: Product
226
- purchase: Purchase
227
- supplier: Supplier
209
+ page_gap: "…"
210
+ previous_label: "← Previous"
data/config/locales/fi.yml CHANGED
@@ -1,64 +1,126 @@
1
1
  ---
2
2
  fi:
3
3
  actions: Toimenpiteet
4
+ activerecord:
5
+ attributes:
6
+ basket:
7
+ created_at: Luotu
8
+ total_price: Hinta
9
+ type: Laji
10
+ category:
11
+ category: Pääryhmä
12
+ description: Kuvaus
13
+ link: Linkki
14
+ name: Nimi
15
+ online: Netissä
16
+ position: Järjetysnummero
17
+ summary: Yhteenveto
18
+ clerk:
19
+ city: Postinumero ja -toimipaikka
20
+ email: S-posti
21
+ name: Etu- ja sukunimi
22
+ password: Salasana
23
+ password_confirmation: Vahvista salasana
24
+ phone: Puhelin
25
+ street: Jakeluosoite
26
+ order:
27
+ canceled_on: Peruttu
28
+ city: Postinumero ja -toimipaikka
29
+ email: S-posti
30
+ name: Etu- ja sukunimi
31
+ note: Muisti
32
+ number: Tilauksen numero
33
+ ordered_on: Tilattu
34
+ paid_on: Maksettu
35
+ password: Salasana
36
+ password_confirmation: Vahvista salasana
37
+ phone: Puhelin
38
+ shipped_on: Lähetetty
39
+ street: Jakeluosoite
40
+ total: Yhteensä
41
+ product:
42
+ category: Tuoteryhmä
43
+ cost: Kustannus
44
+ description: Kuvaus
45
+ ean: Ean
46
+ inventory: Inventaario
47
+ name: Nimi
48
+ online: Netissä
49
+ price: Hinta
50
+ scode: Tuottajatunnus
51
+ summary: Yhteenveto
52
+ stock_level: Haluttu Inventaario
53
+ supplier: Tuottaja
54
+ tax: Veroprosentti
55
+ weight: Paino
56
+ purchase:
57
+ name: Nimi
58
+ ordered_on: Tilattu
59
+ received_on: Vastaanotettu
60
+ supplier:
61
+ city: Kaupunki
62
+ name: Nimi
63
+ phone: Puhelin
64
+ street: Osoite
65
+ supplier_name: Tuottaja
66
+ models:
67
+ basket: Ostoskori
68
+ category: Tuoteryhmä
69
+ clerk: Käyttäjä
70
+ order: Tilaus
71
+ product: Tuote
72
+ purchase: Sisäänosto
73
+ supplier: Tuottaja
4
74
  add: Lisää
5
- add_inventory: Lisää inventaarioon
6
75
  add_to_basket: Lisää ostoskoriin
7
76
  address: Osoite
8
- addresses: Osoiteet
9
77
  admin: Admin
10
78
  are_you_sure: Oletko varma
11
- as_inventory: Inventaarioon
12
- back: Listalle
79
+ back: Takaisin
13
80
  basket: Ostoskori
14
81
  basket_empty: Ostoskori on tyhjä
15
82
  basket_locked: Ostoskoria ei voi muuttaa
16
83
  baskets: Ostoskorit
17
- between: haarukka
18
84
  blanks: Tyhjät
19
85
  cancel: Peruuta
20
- cancel_order_button: Peruta s-post
86
+ cancel_confirmation: Peruuminen palauta inventaario, ja nolla lähetyksen päivä.
21
87
  canceled_on: Peruutettu
22
88
  categories: Tuoteryhmät
23
89
  category: Tuoteryhmä
24
90
  checkout: Checkout
25
91
  choose_product_for_basket: Valitse tuote ostoskoriin
92
+ choose_shipment: Valitse toimitustapa
26
93
  city: Kaupunki
27
94
  clerk: Käyttäjä
28
95
  clerks: Käyttäjät
29
- confirm_order_button: Vahvistus s-post
30
96
  contact: Kontaktihenkilö
97
+ contact_details: Yhteystiedot
31
98
  cost: Kustannus
32
99
  count: Määrä
33
100
  country: Maa
34
101
  create: Luo
35
102
  create_success: Luotu onnistuneesti
36
- created_at: Luotu
103
+ customer: Asiakas
37
104
  delete: Poista
38
- deleted: Poisettu
105
+ deleted: Poistettu
39
106
  description: Kuvaus
40
107
  destroy: Poista
41
108
  discount: Alennus
42
109
  ean: Ean
43
110
  edit: Muokkaa
44
- editing: Muokkaamassa
45
111
  email: S-posti
46
- empty: tyhjä
47
- error: Virhe
112
+ error: Virhe
48
113
  extra_picture: Toinen kuva
49
114
  filter: Hae
50
115
  first_name: Etunimi
51
- fix_errors: Yhteystiedoistasi puuttuu tietoja
52
- history: Tilaushistoria
53
- home: Kotiin
54
- info: Info
116
+ fix_errors: Puuttuu tietoja
55
117
  inventorized: Inventoitu
56
118
  inventory: Inventaario
57
- item: Tuote
58
119
  item_removed: Tuote poistettu
59
120
  items: Tuotteet
60
121
  last_name: Sukunimi
61
122
  link: linkki
123
+ locked: Lukittu
62
124
  made_offline: poistettu netistä
63
125
  made_online: laitettu nettiin
64
126
  main_picture: Kuva
@@ -70,44 +132,36 @@ fi:
70
132
  name_contains: Nimi sisältää
71
133
  new: Uusi
72
134
  new_item: Uusi tuote tuotelinjalle
73
- next: seuraava
74
- notice: Huom
135
+ nolla: Nolla hinnat
75
136
  not_online: ei netissä
76
137
  note: Muistiinpano
77
138
  online: Netissä
78
- online_eq: Online?
79
139
  order: Tilaus
80
- order_number: Tilauksen numero
81
- order_total: Loppusumma
82
- order_more_for_free_shipping: "%{more} € jäljellä ilmaiseen toimitukseen"
140
+ order_actions: Toiminnot
141
+ order_button:
142
+ cancel: Peruutus
143
+ confirm: Vahvistus
144
+ paid: Maksettu
145
+ shipped: Lähetetty
146
+ order_mail: Lähetä sähköposti
147
+ order_number: Tilausnumero
148
+ order_print: Tulosta
83
149
  ordered: Tilattu
84
- ordered_on: Tilattu
150
+ ordered_on: Tilauspäivä
85
151
  orders: Tilaukset
86
- our_shop: Liikkeemme
87
152
  paid: Maksa
88
153
  paid_on: Maksettu
89
- paid_order_button: Maksettu s-post
90
- parent: Tuoteryhmä
91
154
  password: Salasana
155
+ payment_info: Maksukoodi
92
156
  phone: Puhelin
93
157
  picture: Kuva
94
- picture2: Toinen kuva
95
- position: Paikka
96
- prev: edellinen
97
158
  preview: Esikatselu
98
159
  price: Hinta
99
- price_between: Hinta haarukka
100
- print: Tulosta
101
- print_order: Tulosta
102
- print_invoice: Tulosta tilaus
103
- print_reminder: Tulosta maksumuistutus
104
- print_slip: Tulosta kuormakirja
105
- print_receipt: Tulosta kuitti
106
160
  product: Tuote
107
161
  product_added: Tuote lisätty ostoskoriin
108
- product_line: Tuotelinja
162
+ product_has_inventory: Tuoteessa on inventaario
109
163
  product_item: Tuote Tuotelinjalla
110
- product_line_has_inventory: Tuotelinjassa on inventaario
164
+ product_line: Tuotelinja
111
165
  products: Tuotteet
112
166
  purchase: Sisäänosto
113
167
  purchases: Sisäänostot
@@ -119,10 +173,10 @@ fi:
119
173
  search: Hae
120
174
  select: Valitse
121
175
  ship: Lähetä
122
- shipment_price: Lähetyksen hinta
123
- shipment_type: Lähetyksen tapa
176
+ shipment_info: Lähetyksen koodi
177
+ shipment_price: Toimituskulut
178
+ shipment_type: Toimitustapa
124
179
  shipped_on: Lähetetty
125
- shipped_order_button: Lähetetty S-Posti
126
180
  shop: Kauppa
127
181
  shop_link: Kauppassa
128
182
  show: Näytä
@@ -131,96 +185,26 @@ fi:
131
185
  sign_out: Kirjaudu ulos
132
186
  sign_up: Luo tili
133
187
  signed_in: Sisäänkirjautunut
134
- signed_up: Tili luottu
135
188
  signed_out: Uloskirjautunut
136
- state: Tila
189
+ signed_up: Tili luottu
190
+ stock_level: Haluttu Inventaario
137
191
  street: Osoite
138
192
  street1: Osoite1
139
193
  street2: Osoite2
194
+ summary: Yhteenveto
140
195
  supplier: Tuottaja
141
196
  suppliers: Tuottajat
142
- summary: Yhteenveto
143
- tax: Alv
144
197
  tax_percent: Veroprosentti
145
- tax_rate: Veroprosentti
146
- terms: Toimitusehdot
147
198
  to_order: Tilaukselle
148
- to_product: Tuotelle
149
199
  to_purchase: Sisänostoksille
150
200
  total: yhteensä
151
201
  total_price: Yhteensä
152
202
  total_tax: Verot
153
- treeview: Treeview
154
- type: Laji
203
+ update: Päivitä
155
204
  update_success: Päivitetty onnistuneesti
156
- updated: Päivitetty
157
205
  vat: Alv
158
206
  weight: Paino
159
207
  will_paginate:
160
208
  next_label: seuraava
161
- page_gap: '…'
209
+ page_gap: "…"
162
210
  previous_label: edellinen
163
- activerecord:
164
- attributes:
165
- basket:
166
- type: Laji
167
- created_at: Luotu
168
- total_price: Hinta
169
- clerk:
170
- city: Kaupunki
171
- email: S-posti
172
- name: Nimi
173
- password: Salasana
174
- password_confirmation: Vahvista salasana
175
- phone: Puhelin
176
- street: Osoite
177
- category:
178
- name: Nimi
179
- summary: Yhteenveto
180
- online: Netissä
181
- category: Pääryhmä
182
- link: Linkki
183
- position: Järjetysnummero
184
- description: Kuvaus
185
- order:
186
- total: Yhteensä
187
- paid_on: Maksettu
188
- shipped_on: Lähetetty
189
- canceled_on: Peruttu
190
- note: Muisti
191
- email: S-posti
192
- password: Salasana
193
- password_confirmation: Vahvista salasana
194
- ordered_on: Tilattu
195
- product:
196
- description: Kuvaus
197
- summary: Yhteenveto
198
- ean: Ean
199
- inventory: Inventaario
200
- name: Nimi
201
- online: Netissä
202
- price: Hinta
203
- cost: Kustannus
204
- scode: Tuottajatunnus
205
- tax: Veroprosentti
206
- weight: Paino
207
- supplier: Tuottaja
208
- category: Tuoteryhmä
209
- purchase:
210
- name: Nimi
211
- ordered_on: Tilattu
212
- received_on: Vastaanotettu
213
- supplier:
214
- city: Kaupunki
215
- name: Nimi
216
- phone: Puhelin
217
- street: Osoite
218
- supplier_name: Tuottaja
219
- models:
220
- basket: Ostoskori
221
- category: Tuoteryhmä
222
- clerk: Käyttäjä
223
- order: Tilaus
224
- product: Tuote
225
- purchase: Sisäänosto
226
- supplier: Tuottaja