oxen_account 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 552a08429f12671826e8917ad9740ca6fc8b2c6d
-  data.tar.gz: 4b5d6b8de1f0512d90d361716a21c88757094fe7
+  metadata.gz: 0b57dda1396e9487d64826ffabb0e0562e1dfde4
+  data.tar.gz: dea53c1746c29c80c0afbbb575498a72ea2c8c5d
 SHA512:
-  metadata.gz: 349d29a9ca74306990b29642f35673592110b84f84cb1ed15f3734dbf756c1d4c2d0458f93de1ba9c60589acd03c44d4c09cafd59dd159186a67ed88cec86197
-  data.tar.gz: ab7a30f2d5c220b612642495a6acea5d89957930e870fec719fa70477b65d8ce0b418ea049680167daa48b675a1ed4708ccc65424b07c0c3dc50b6c87fffcc1b
+  metadata.gz: ea8d2f4de0d574f76212b95c1f5496d0970500babb700c62751b71c08dcb58b657e5d29d82c9970389c277ba7ea1c642b99193f37f297f895b1710de0aa6de37
+  data.tar.gz: 52c0f0a6756f759c257cd1c79b5dde63762e1aa5ae7ee9f40306710dde1457e8d01de5dab53c84737b113a1fdf5277331e1962d846b70d599ca27f7e07a849a4

data/app/controllers/oxen/accounts_controller.rb

@@ -12,7 +12,22 @@ class Oxen::AccountsController < AbstractResourcesController
     # end
 
     def resource_params
-      params.require(:account).permit(:name, :active, :default_url, :chargeable, :last_charged_at, :free_users )
+      raise 'implement in your controller'
+      # params.require(:account).permit(:name, :active, :default_url, :chargeable, :last_charged_at, :free_users )
+    end
+
+    def set_fab_button_options
+      raise 'implement in your controller'
+      #
+      # opt = { items: {}}
+      # case params[:action]
+      # when 'new';   #opt[:items].merge! print: { ajax: 'get', icon: 'print', class: 'blue lighten-2', url: '/stocks/print?print_list=true', browser: 'new' }
+      # when 'edit';  #opt[:items].merge! print: { ajax: 'get', icon: 'print', class: 'blue lighten-2', url: '/stocks/print?print_list=true', browser: 'new' }
+      # when 'show';  #opt[:items].merge! print: { ajax: 'get', icon: 'print', class: 'blue lighten-2', url: '/stocks/print', browser: 'new' }
+      # when 'index'; #opt[:items].merge! print: { ajax: 'get', icon: 'print', class: 'blue lighten-2', url: '/stocks/print?print_list=true', browser: 'new' }
+      # end
+      #
+      # @fab_button_options = opt
     end
 
 end

data/app/models/ox_account.rb

@@ -2,7 +2,6 @@ class OxAccount < AbstractResource
   self.table_name = 'accounts'
   establish_connection ((Rails.env=="development") ? :dev_oxen_tables : :oxen_tables )
 
-  has_paper_trail
 
   has_many :users, dependent: :destroy, foreign_key: 'account_id'
   has_many :printers, dependent: :destroy, foreign_key: 'account_id'

data/app/views/oxen/accounts/_form.html.haml

@@ -1,5 +1,13 @@
+:css
+  #drop_zone {
+    height: 100%;
+    width: 100%;
+    border-radius: 10px;
+    padding: 5px;
+  }
 
-= simple_form_for(resource, html: {class: 'col sl12'} ) do |f|
+
+= simple_form_for(resource, html: {class: 'col sl12', multipart: true}, data: { form_type:'record', form_id: 'accountsform'} ) do |f|
   / - if parent?
   /   = render @parent
   = f.error_notification
@@ -7,6 +15,9 @@
   .form-inputs
     .row
       = f.input :name, class: :validate, disabled: @disabled, autofocus: true
+    -#
+    -# .row
+    -#   = link_to 'Her kan du komprimere logo filen', 'http://www.base64css.com/', target: "_blank"
 
     .row
       = f.input :default_url, class: :validate, disabled: @disabled
@@ -45,38 +56,12 @@
       .col.sl12{ style: "margin-bottom: 30px"}
     %hr
 
+    = react_component 'DropZone', { url: (account_photos_url(resource) rescue ''), classes: 'files', id: 'drop_zone', entity: 'account' } if params[:action]!='show'
+
+:coffeescript
 
+  $ ->
 
-/ from oxen_user/views/accounts/_form.html.haml
-/
-/ = simple_form_for(resource, html: {class: 'col sl12'} ) do |f|
-/   / - if parent?
-/   /   = render @parent
-/   = f.error_notification
-/
-/   .form-inputs
-/     .row
-/       = f.input :name, class: :validate, disabled: @disabled, autofocus: true
-/
-/     .row
-/       .input-field.col.s12
-/         %label{ style: "margin-top: -20px"}= t('.account_active')
-/         .switch
-/           %label
-/             = t(:passive)
-/             =f.check_box :active, disabled: @disabled
-/             %span.lever
-/             = t(:active)
-/
-/     .row
-/       .col.sl12{ style: "margin-bottom: 30px"}
-/     %hr
-/
-/   - unless @disabled
-/     .row
-/       .form-actions.right-align
-/         = f.button :submit, t(".#{params[:action]}.submit")
-/
-/ - if %w{ show edit }.include? params[:action]
-/   :coffeescript
-/     $('form label').addClass('active')
+    window.build_drop_zone_photo = (file,entity) =>
+      [ '<input type="hidden" name="',entity,'[ps][',file.id,'][id]" id="photos_',file.id,'_id" class="files_uploaded" />',
+      '<input type="text" name="',entity,'[ps][',file.id,'][purpose]" id="photos_',file.id,'_purpose" class="files_uploaded" />'].join('')

data/config/routes.rb

@@ -38,6 +38,7 @@ Rails.application.routes.draw do
   scope '/admin' do
     resources :accounts, concerns: [:activating, :attaching, :printing] do
       resources :users, concerns: [:activating, :printing]
+      resources :photos
     end
   end
 end

data/lib/generators/oxen_account/templates/account.rb

@@ -1,8 +1,18 @@
 class CreateAccounts < ActiveRecord::Migration
   def change
     create_table :accounts do |t|
-      t.string :name
-      t.boolean :active
+      t.string     :name
+      t.string     :default_url
+      t.text       :logo
+
+      ## manageable
+      t.boolean    :active
+      t.integer    :lock_version
+
+      ## chargeable
+      t.boolean    :chargeable, null: false, default: true
+      t.datetime   :last_charged_at
+      t.integer    :free_users, null: false, default: 0
 
       t.timestamps null: false
     end

data/lib/oxen_account/version.rb

@@ -1,3 +1,3 @@
 module OxenAccount
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxen_account
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Walther H Diechmann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise