office_clerk 0.4 → 0.5

data/config/locales/config.yml

@@ -7,4 +7,4 @@ config:
     tax: 24.0
     free_shipping: 100
   print_styles: ""
-  
+  mail_buttons: "confirm cancel paid shipped"

data/config/locales/en.yml

@@ -3,50 +3,6 @@ en:
   empty: Empty
   online_eq: Online?
   actions: Actions
-  activerecord:
-    attributes:
-      basket:
-        created_at: Created
-        total_price: Price
-      clerk:
-        city: City
-        email: Email
-        name: Name
-        password: Passord
-        password_confirmation: Password confirmation
-        phone: Phone
-        street: Street
-      order:
-        email: Email
-        ordered_on: Ordered on
-      product:
-        description: Description
-        ean: Ean
-        inventory: Inventory
-        name: Name
-        online: online
-        price: Price
-        scode: Supplier code
-        tax: Tax rate
-        weight: Weight
-      purchase:
-        name: Name
-        ordered_on: Ordered on
-        received_on: Received on
-      supplier:
-        city: City
-        name: Name
-        phone: Phone
-        street: Street
-        supplier_name: Supplier
-    models:
-      basket: Cart
-      category: Product group
-      clerk: User
-      order: Order
-      product: Product
-      purchase: Purchase
-      supplier: Supplier
   add: Add
   add_inventory: Add Inventory
   add_to_basket: Add to basket
@@ -56,7 +12,6 @@ en:
   are_you_sure: Are you sure?
   as_inventory: As Inventory
   back: Back
-  barcode: Barcode
   basket: Basket
   basket_empty: Basket is empty
   basket_locked: Basket is locked, unlock to change
@@ -64,12 +19,15 @@ en:
   between: ' between'
   cancel: Cancel
   canceled_on: Canceled on
+  cancel_order_button: Cancel email
   categories: Product Categories
   category: Product Category
   choose_product_for_basket: Choose product for basket
+  checkout: Checkout
   city: City
   clerk: User
   clerks: Users
+  confirm_order_button: Send Confirmation Email
   contact: Contact
   cost: Cost
   count: Count
@@ -91,6 +49,7 @@ en:
   filter: Filter
   first_name: First Name
   history: Order history
+  home: Home
   info: Info
   inventorized: Inventorized
   inventory: Inventory
@@ -101,6 +60,7 @@ en:
   link: Link
   made_offline: taken offline
   made_online: made online
+  manage: Manage
   main_picture: Main Picture
   make_order: Make Order
   make_purchase: Make Purchase
@@ -111,27 +71,38 @@ en:
   new_item: New product item
   next: Next
   not_online: not online
+  notice: Notice
   online: Online
   order: Order
   order_number: Number
+  order_more_for_free_shipping: "Order %{more} €  for free shipping"
   order_total: Order total
   ordered: Ordered
   ordered_on: Ordered On
   orders: Orders
   our_shop: Our shop
+  paid: Paid
   paid_on: Paid on
+  paid_order_button: Paid Mail
   parent: Parent
+  password: Password
   phone: Phone
   picture: Picture
   picture2: Picture 2
   position: Position
   prev: Previous
+  preview: Preview
   price: Price
   price_between: Price between
   print: Print
+  print_invoice: Print Invoice
   print_order: Print Order
+  print_reminder: Print Reminder
+  print_slip: Print Package Slip
+  print_receipt: Print Receipt
   product: Product
   product_added: Product added
+  product_item: Product Item
   product_line: Product Line
   product_line_has_inventory: Product Line has inventori
   products: Products
@@ -142,10 +113,13 @@ en:
   received: Received
   received_on: Received On
   scode: Supplier code
+  select: Select
   search: Search
+  ship: Ship
   shipment_price: Shipment price
   shipment_type: Shipment type
   shipped_on: Shipped on
+  shipped_order_button: Ship Order Email
   shop: Shop
   show: Show
   sign_in: Log in
@@ -160,6 +134,7 @@ en:
   street2: Street2
   supplier: Supplier
   suppliers: Suppliers
+  summary: Summary
   tax: Vat
   tax_percent: Tax percent
   tax_rate: Vat rate
@@ -180,3 +155,58 @@ en:
     next_label: Next →
     page_gap: '…'
     previous_label: '← Previous'
+  activerecord:
+    attributes:
+      basket:
+        created_at: Created
+        total_price: Price
+      clerk:
+        city: City
+        email: Email
+        name: Name
+        password: Passord
+        password_confirmation: Password confirmation
+        phone: Phone
+        street: Street
+      category:
+        name: Name
+        online: Online
+        category: Parent
+        link: Link
+        position: Position
+        description: Description
+      order:
+        email: Email
+        ordered_on: Ordered on
+      purchase:
+        name: Name
+        ordered_on: Ordered on
+        received_on: Received on
+      product:
+        description: Description
+        ean: Ean
+        inventory: Inventory
+        name: Name
+        online: online
+        price: Price
+        scode: Supplier code
+        tax: Tax rate
+        weight: Weight
+        cost: Cost
+        supplier: Suppier
+        category: Category
+        name: Name
+      supplier:
+        city: City
+        name: Name
+        phone: Phone
+        street: Street
+        supplier_name: Supplier
+    models:
+      basket: Cart
+      category: Product group
+      clerk: User
+      order: Order
+      product: Product
+      purchase: Purchase
+      supplier: Supplier

data/config/locales/fi.yml

@@ -1,60 +1,6 @@
 ---
 fi:
   actions: Toimenpiteet
-  activerecord:
-    attributes:
-      basket:
-        created_at: Luotu
-        total_price: Hinta
-      clerk:
-        city: Kaupunki
-        email: S-posti
-        name: Nimi
-        password: Salasana
-        password_confirmation: Vahvista salasana
-        phone: Puhelin
-        street: Osoite
-      category:
-        name: Nimi
-        online: Netissä
-        category: Pääryhmä
-        link: Linkki
-        position: Järjetysnummero
-        description: Kuvaus
-      order:
-        email: S-posti
-        ordered_on: Tilattu
-      product:
-        description: Kuvaus
-        ean: Ean
-        inventory: Inventaario
-        name: Nimi
-        online: Netissä
-        price: Hinta
-        cost: Kustannus
-        scode: Tuottajatunnus
-        tax: Veroprosentti
-        weight: Paino
-        supplier: Tuottaja
-        category: Tuoteryhmä
-      purchase:
-        name: Nimi
-        ordered_on: Tilattu
-        received_on: Vastaanotettu
-      supplier:
-        city: Kaupunki
-        name: Nimi
-        phone: Puhelin
-        street: Osoite
-        supplier_name: Tuottaja
-    models:
-      basket: Ostoskori
-      category: Tuoteryhmä
-      clerk: Käyttäjä
-      order: Tilaus
-      product: Tuote
-      purchase: Sisäänosto
-      supplier: Tuottaja
   add: Lisää
   add_inventory: Lisää inventaarioon
   add_to_basket: Lisää ostoskoriin
@@ -64,13 +10,13 @@ fi:
   are_you_sure: Oletko varma
   as_inventory: Inventaarioon
   back: Listalle
-  barcode: Viivakoodi
   basket: Ostoskori
   basket_empty: Ostoskori on tyhjä
   basket_locked: Ostoskoria ei voi muuttaa
   baskets: Ostoskorit
   between: haarukka
   cancel: Peruuta
+  cancel_order_button: Peruta s-post
   canceled_on: Peruutettu
   categories: Tuoteryhmät
   category: Tuoteryhmä
@@ -79,6 +25,7 @@ fi:
   city: Kaupunki
   clerk: Käyttäjä
   clerks: Käyttäjät
+  confirm_order_button: Vahvistus s-post
   contact: Kontaktihenkilö
   cost: Kustannus
   count: Määrä
@@ -110,8 +57,6 @@ fi:
   items: Tuotteet
   last_name: Sukunimi
   link: linkki
-  login: Kirjaudu sisään
-  logout: Kirjaudu ulos
   made_offline: poistettu netistä
   made_online: laitettu nettiin
   main_picture: Kuva
@@ -138,6 +83,7 @@ fi:
   our_shop: Liikkeemme
   paid: Maksa
   paid_on: Maksettu
+  paid_order_button: Maksettu s-post
   parent: Tuoteryhmä
   password: Salasana
   phone: Puhelin
@@ -145,6 +91,7 @@ fi:
   picture2: Toinen kuva
   position: Paikka
   prev: edellinen
+  preview: Esikatselu
   price: Hinta
   price_between: Hinta haarukka
   print: Tulosta
@@ -172,6 +119,7 @@ fi:
   shipment_price: Lähetyksen hinta
   shipment_type: Lähetyksen tapa
   shipped_on: Lähetetty
+  shipped_order_button: Lähetetty S-Posti
   shop: Kauppa
   show: Näytä
   sign_in: Kirjaudu sisään
@@ -180,22 +128,13 @@ fi:
   sign_up: Luo tili
   signed_in: Sisäänkirjautunut
   signed_out: Uloskirjautunut
-  simple_form:
-    error_notification:
-      default_message: 'Tarkista uudelleen:'
-    'false': Ei
-    "no": Ei
-    required:
-      mark: '*'
-      text: required
-    'true': Kyllä
-    "yes": Kyllä
   state: Tila
   street: Osoite
   street1: Osoite1
   street2: Osoite2
   supplier: Tuottaja
   suppliers: Tuottajat
+  summary: Yhteenveto
   tax: Alv
   tax_percent: Veroprosentti
   tax_rate: Veroprosentti
@@ -216,3 +155,57 @@ fi:
     next_label: seuraava
     page_gap: '…'
     previous_label: edellinen
+  activerecord:
+    attributes:
+      basket:
+        created_at: Luotu
+        total_price: Hinta
+      clerk:
+        city: Kaupunki
+        email: S-posti
+        name: Nimi
+        password: Salasana
+        password_confirmation: Vahvista salasana
+        phone: Puhelin
+        street: Osoite
+      category:
+        name: Nimi
+        online: Netissä
+        category: Pääryhmä
+        link: Linkki
+        position: Järjetysnummero
+        description: Kuvaus
+      order:
+        email: S-posti
+        ordered_on: Tilattu
+      product:
+        description: Kuvaus
+        ean: Ean
+        inventory: Inventaario
+        name: Nimi
+        online: Netissä
+        price: Hinta
+        cost: Kustannus
+        scode: Tuottajatunnus
+        tax: Veroprosentti
+        weight: Paino
+        supplier: Tuottaja
+        category: Tuoteryhmä
+      purchase:
+        name: Nimi
+        ordered_on: Tilattu
+        received_on: Vastaanotettu
+      supplier:
+        city: Kaupunki
+        name: Nimi
+        phone: Puhelin
+        street: Osoite
+        supplier_name: Tuottaja
+    models:
+      basket: Ostoskori
+      category: Tuoteryhmä
+      clerk: Käyttäjä
+      order: Tilaus
+      product: Tuote
+      purchase: Sisäänosto
+      supplier: Tuottaja

data/config/routes.rb

@@ -36,6 +36,7 @@ OfficeClerk::Engine.routes.draw do
       match "search" => "orders#index", :via => [:get, :post]
     end
     member do
+      get "mail/:act" , :action => :mail , :as => :mail
       get :pay
       get :ship
       patch :ship
@@ -64,7 +65,6 @@ OfficeClerk::Engine.routes.draw do
     end
     member do
       get :delete
-      get :barcode  #print the barcode and price on a 50x25 mm area
     end
   end
 

data/db/migrate/20131226143612_categories.rb

@@ -4,7 +4,8 @@ class Categories < ActiveRecord::Migration
       t.references  :category
       t.boolean     :online, :default => false
       t.string      :name
-      t.string      :description
+      t.text        :description , :default => ""
+      t.text        :summary      , :default => ""
       t.integer     :position , :default => 1
       t.string      :link
       t.attachment  :main_picture

data/db/migrate/20131226151332_products.rb

@@ -4,7 +4,8 @@ class Products < ActiveRecord::Migration
       t.float       :price      , :null => false
       t.string      :name       , :null => false
       t.string      :link        
-      t.text        :description
+      t.text        :description , :default => ""
+      t.text        :summary      , :default => ""
       t.attachment  :main_picture
       t.attachment  :extra_picture
       t.boolean     :online ,       :default => false

data/lib/office_clerk.rb

@@ -5,19 +5,14 @@ require "jquery-ui-rails"
 require "kramdown"
 require "will_paginate"
 
-require 'simple_form' 
-require "prawn"
 require 'will_paginate-bootstrap'
 require 'bootstrap-sass'
 require 'bootstrap_form'
 require "paperclip"
 require 'rails-i18n'
-
-require "barby"
-require "chunky_png"
+require "jquery-rails"
+require "gon"
 require "bcrypt"
-require "opal"
-require "opal/rails"
 
 require "office_clerk/shipping_method"