From edfed2f82102783ac3749cfe3ab2d56acb126201 Mon Sep 17 00:00:00 2001 From: chandra Date: Thu, 12 Apr 2012 19:40:03 +0530 Subject: [PATCH] Before creating active admin models --- Gemfile | 1 + Gemfile.lock | 43 +++ app/admin/dashboards.rb | 44 +++ app/assets/javascripts/.bills.js.swp | Bin 0 -> 16384 bytes app/assets/javascripts/.products.js.swp | Bin 0 -> 12288 bytes app/assets/javascripts/active_admin.js | 1 + app/assets/javascripts/application.js | 2 + app/assets/javascripts/bills.js | 169 +++++++++++ app/assets/javascripts/bootstrap-modal.js | 210 ++++++++++++++ app/assets/javascripts/bootstrap-typeahead.js | 271 ++++++++++++++++++ app/assets/javascripts/products.js | 122 ++++++++ app/assets/stylesheets/active_admin.css.scss | 6 + app/assets/stylesheets/bills.css.scss | 3 + app/assets/stylesheets/products.css.scss | 8 + app/controllers/bills_controller.rb | 20 ++ app/controllers/products_controller.rb | 49 ++++ app/helpers/bills_helper.rb | 2 + app/helpers/products_helper.rb | 2 + app/models/admin_user.rb | 9 + app/models/bill.rb | 5 + app/models/billitem.rb | 2 + app/models/product.rb | 6 + app/views/bills/.new.html.erb.swp | Bin 0 -> 12288 bytes app/views/bills/new.html.erb | 40 +++ app/views/layouts/application.html.erb | 4 +- app/views/products/._product.html.erb.swp | Bin 0 -> 12288 bytes app/views/products/_product.html.erb | 8 + app/views/products/index.html.erb | 43 +++ app/views/products/products_list.html.erb | 21 ++ config/environments/.production.rb.swp | Bin 0 -> 12288 bytes config/initializers/active_admin.rb | 129 +++++++++ config/initializers/devise.rb | 223 ++++++++++++++ config/locales/devise.en.yml | 57 ++++ config/routes.rb | 68 +---- ...1606_rename_product_to_name_in_products.rb | 9 + ...0120412135404_devise_create_admin_users.rb | 52 ++++ .../20120412192412_create_admin_notes.rb | 16 ++ ...0412192413_move_admin_notes_to_comments.rb | 25 ++ db/schema.rb | 39 +++ public/index.html | 241 ---------------- test/fixtures/admin_users.yml | 11 + test/functional/bills_controller_test.rb | 7 + test/functional/products_controller_test.rb | 7 + test/unit/admin_user_test.rb | 7 + test/unit/helpers/bills_helper_test.rb | 4 + test/unit/helpers/products_helper_test.rb | 4 + 46 files changed, 1690 insertions(+), 300 deletions(-) create mode 100644 app/admin/dashboards.rb create mode 100644 app/assets/javascripts/.bills.js.swp create mode 100644 app/assets/javascripts/.products.js.swp create mode 100644 app/assets/javascripts/active_admin.js create mode 100644 app/assets/javascripts/bills.js create mode 100644 app/assets/javascripts/bootstrap-modal.js create mode 100644 app/assets/javascripts/bootstrap-typeahead.js create mode 100644 app/assets/javascripts/products.js create mode 100644 app/assets/stylesheets/active_admin.css.scss create mode 100644 app/assets/stylesheets/bills.css.scss create mode 100644 app/assets/stylesheets/products.css.scss create mode 100644 app/controllers/bills_controller.rb create mode 100644 app/controllers/products_controller.rb create mode 100644 app/helpers/bills_helper.rb create mode 100644 app/helpers/products_helper.rb create mode 100644 app/models/admin_user.rb create mode 100644 app/views/bills/.new.html.erb.swp create mode 100644 app/views/bills/new.html.erb create mode 100644 app/views/products/._product.html.erb.swp create mode 100644 app/views/products/_product.html.erb create mode 100644 app/views/products/index.html.erb create mode 100644 app/views/products/products_list.html.erb create mode 100644 config/environments/.production.rb.swp create mode 100644 config/initializers/active_admin.rb create mode 100644 config/initializers/devise.rb create mode 100644 config/locales/devise.en.yml create mode 100644 db/migrate/20120409041606_rename_product_to_name_in_products.rb create mode 100644 db/migrate/20120412135404_devise_create_admin_users.rb create mode 100644 db/migrate/20120412192412_create_admin_notes.rb create mode 100644 db/migrate/20120412192413_move_admin_notes_to_comments.rb create mode 100644 db/schema.rb delete mode 100644 public/index.html create mode 100644 test/fixtures/admin_users.yml create mode 100644 test/functional/bills_controller_test.rb create mode 100644 test/functional/products_controller_test.rb create mode 100644 test/unit/admin_user_test.rb create mode 100644 test/unit/helpers/bills_helper_test.rb create mode 100644 test/unit/helpers/products_helper_test.rb diff --git a/Gemfile b/Gemfile index f4bec0e..381c485 100644 --- a/Gemfile +++ b/Gemfile @@ -21,6 +21,7 @@ group :assets do end gem 'jquery-rails' +gem 'activeadmin' # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 932c5fe..068108f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,6 +14,17 @@ GEM rack-cache (~> 1.1) rack-test (~> 0.6.1) sprockets (~> 2.1.2) + activeadmin (0.4.0) + bourbon (>= 1.0.0) + devise (>= 1.1.2) + fastercsv + formtastic (>= 2.0.0) + inherited_resources (< 1.3.0) + jquery-rails (>= 1.0.0) + kaminari (>= 0.13.0) + meta_search (>= 0.9.2) + rails (>= 3.0.0) + sass (>= 3.1.0) activemodel (3.2.1) activesupport (= 3.2.1) builder (~> 3.0.0) @@ -29,6 +40,9 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) + bcrypt-ruby (3.0.1) + bourbon (1.3.6) + sass (>= 3.1) builder (3.0.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -37,22 +51,47 @@ GEM coffee-script-source execjs coffee-script-source (1.2.0) + devise (2.0.0) + bcrypt-ruby (~> 3.0) + orm_adapter (~> 0.0.3) + railties (~> 3.1) + warden (~> 1.1) erubis (2.7.0) execjs (1.3.0) multi_json (~> 1.0) + fastercsv (1.5.4) + formtastic (2.0.2) + rails (~> 3.0) + has_scope (0.5.1) hike (1.2.1) i18n (0.6.0) + inherited_resources (1.2.2) + has_scope (~> 0.5.0) + responders (~> 0.6.0) journey (1.0.3) jquery-rails (2.0.1) railties (>= 3.2.0, < 5.0) thor (~> 0.14) json (1.6.5) + kaminari (0.13.0) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + railties (>= 3.0.0) mail (2.4.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) + meta_search (1.1.2) + actionpack (~> 3.1) + activerecord (~> 3.1) + activesupport (~> 3.1) + meta_search + polyamorous (~> 0.5.0) mime-types (1.17.2) multi_json (1.1.0) + orm_adapter (0.0.6) + polyamorous (0.5.0) + activerecord (~> 3.0) polyglot (0.3.3) rack (1.4.1) rack-cache (1.2) @@ -79,6 +118,7 @@ GEM rake (0.9.2.2) rdoc (3.12) json (~> 1.4) + responders (0.6.5) sass (3.1.15) sass-rails (3.2.4) railties (~> 3.2.0) @@ -98,11 +138,14 @@ GEM uglifier (1.2.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) + warden (1.1.0) + rack (>= 1.0) PLATFORMS ruby DEPENDENCIES + activeadmin coffee-rails (~> 3.2.1) jquery-rails rails (= 3.2.1) diff --git a/app/admin/dashboards.rb b/app/admin/dashboards.rb new file mode 100644 index 0000000..5c8a3fc --- /dev/null +++ b/app/admin/dashboards.rb @@ -0,0 +1,44 @@ +ActiveAdmin::Dashboards.build do + + # Define your dashboard sections here. Each block will be + # rendered on the dashboard in the context of the view. So just + # return the content which you would like to display. + + # == Simple Dashboard Section + # Here is an example of a simple dashboard section + # + # section "Recent Posts" do + # ul do + # Post.recent(5).collect do |post| + # li link_to(post.title, admin_post_path(post)) + # end + # end + # end + + # == Render Partial Section + # The block is rendered within the context of the view, so you can + # easily render a partial rather than build content in ruby. + # + # section "Recent Posts" do + # div do + # render 'recent_posts' # => this will render /app/views/admin/dashboard/_recent_posts.html.erb + # end + # end + + # == Section Ordering + # The dashboard sections are ordered by a given priority from top left to + # bottom right. The default priority is 10. By giving a section numerically lower + # priority it will be sorted higher. For example: + # + # section "Recent Posts", :priority => 10 + # section "Recent User", :priority => 1 + # + # Will render the "Recent Users" then the "Recent Posts" sections on the dashboard. + + # == Conditionally Display + # Provide a method name or Proc object to conditionally render a section at run time. + # + # section "Membership Summary", :if => :memberships_enabled? + # section "Membership Summary", :if => Proc.new { current_admin_user.account.memberships.any? } + +end diff --git a/app/assets/javascripts/.bills.js.swp b/app/assets/javascripts/.bills.js.swp new file mode 100644 index 0000000000000000000000000000000000000000..5e0bc1cfc6948da1957c849433c73ee30911fb94 GIT binary patch literal 16384 zcmeI3TWlOx8OIOdQkFC%y#T$4>ab2cv+;V@7urTkY$#MHL2hEzPAH1f)$GjK-7&K> z+qt+lu4z>QYASJgM{3mvTEyiEkdVR?Jb?O!pj8E^0wEr#P!&pvXraLW`{v?VCw6#2 zs+2R*&$~0{GT-@s=lf>n%(^pm`uKhF?#8UZc0h=w?>>I=(VJ()n>Pw!_buNEEh^b{ zv)64e7)HC+p~5d_9X1!kU`5$+)cmCDd9L3pKCR)fX+@Dj(TcTdMRw>8@x6m;QDf!m zXSk{fx`I~V+EgHkyOT%uiP@RyDH33;`Vo24ji;_nE%d0h0$KsBfL1^&pcT*xXa%$a z*Qf&VaF2KtW8agF|4jDzj%}as%=V9DpQpE#XS@1CE1(t73TOqi0$KsBfL1^&pcT*x zXa%$aT7kEr0+u6$`)(or`W_gE_y76x{~z`X@iO=Y_&N9yI0rn?1E)b9To3;Iej$De zE`V=>FM|l20OR1_`-J!{_#yZnI1hZ#1#R#-unbOu1#leP3EtQ%#6Q5x-~xCGtbqma zX>c#N6MPu#1()6@#P7h*z<0pcK?rD>cmmj97VHJDVL|9m-~xCWoChwj!Gqudumnzm1wh+oO;ipyMP;-0F;U6> zRyOe!J3L$J&yMfPj z(y}Dr7Oej*8+iSZ}+r8sH}*fnTljxeqq16>H6;E=vZ;IeE~eeYU`L zw)PuCD^z}L8gXdU8de;Krr|mU)jMb!4M%w@R&Dxa3ZDvfV3}ciuKjtVE(=@9&Sq2I z%hjbNsevThWH$^3GVUurB)C`CA13h`-x{d7svQglZd^UPbH{ezM}emrUeGg*<TublRK)D^hAXmBPtTd$T=m4lsl@bFbqOT!nI^|Lay~gI4K$igGeo_ zwV1|Fo@{hn-!To+w8c%zgI0BFSC>(2#Yt3`Tp{%snSd=+aT5BnYk8641L-s&X~$U8 z*y?zSgdYwSPQ=I3Ig`47ml-o^TsD`snMc!X%RU&())i-GN3^>^I51%EL36u1?IV%3GRy7}KbtnFDsZ;-se~`{IC2qzi0rGPP~bT-|a} z$~L$ZS{P<28FMf3VCWSQ!;xIb$br=uCQ*N@0!cxxd?>N}*p1g)WD@V7Zw_n}a-eg` zNXU~{=)%Y)^d)aX1$N-11@xs{;5uBNjirlsdKPNJ0o=OJiu(-;NVA566n*&skP|jU z9yoGDN)DoX94F880wDqyQ=rg*sE79Mg4K{OGXLl2OEXc)=ag>*XWG#!4Nv*KxR1iZ zI^3r?DrArHG)nu*qCG9-aisyzo)Mxv*fu$mvmoZi(8F{$t4E`u=lv&a!Ix>?(C= z<>M&wqwG_fHO6p$H!pONcP7&t(#go}`6z3;z$(n|gw1(MwN1X|q*;ahlL{s{&@lz* zGtZi7?#xnXeh{VG=lyirh*P5ElrRz%xXe_moYzpJ=#6_R$4KIG=4kM-%X%!=tc~_a z=9EGz?}x@mhl{SLUMa%L_2}?Oz0r^>sycZk5^D(=ba z66FXE5`$tH+y6L(9Y#>Hz8ly{)Y`g#-+saVEPL11E5(l_rAJRhs zUtcPff$J}DsJ5orNHRFTu9vHu=>x^(-K6(%Y*6{`l}3)M_&udFN<2Q~AzIwhoH^j(ik)#WOV+w{V~STp3u zWr$ZRW;i~zHv7ob+7W7<^=hnT+a!HXew6;K(;wQ+Hv>=dSf;a;**vqhezw^wtsB}k bEL;}rnmB8|Oqi_)V!d32zUA@KoDly7pz3?x literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/.products.js.swp b/app/assets/javascripts/.products.js.swp new file mode 100644 index 0000000000000000000000000000000000000000..a89ac01131ac0f10ef87f15bcca55d3cd7747b58 GIT binary patch literal 12288 zcmeI2zmL-}6vqt%Qur-kVGHG|q|!Cz?u0<4EfQh?Bse5~OrXdlZgEMIkhp~k6$Zo~ zz{rLW3kwqyto#8CFu{bx&dP%L+DXcB0*)2kv-Gtc`@NUv&r65X`Nol}XV2TmycLGF zm$4_G95O-Nv@`px6J*vj(K5q>Y5!k#0RJw&d!11@12hJ&0dl-8QJ%ci+2W^Mm@5UVg=p?iZHKA?L zhh2=lfnGolq3h65Xa}?n`nHp?FVI`)74#UIK{uc?&_U=Ua(D;5hF(E0p%>6|Nayzm zqDBOW01+SpM1Tko0U|&I{&xbiS>pt=Oox8fV}}-r|wSlpAuzy-_~U zwt7!QxwuytEV$0$>iVo7$y_-NFU>?M;?OPEeKks>B1XB=C<9sAI}^B%>&N1bU+yA; z%H&`mGS>+r8QgMUZkJ8=i%9u62t=MYOd91wyFZQtC6m~g6k9s=%hOb}onfBDjyYVA z#7e}fSjLrLyn}1E)=v{WDEP zRc3nn2df|nD=R(yjg>XwnO&B^?%Ma54lX82mvaJKr$wKSBjxJa>EwAB`YNf4mZNF_ zUlwd}UI_$1A#B?OH-|)Q?Y^eqW?2{6GM#00T6xOjo_$S!V;yb>5iV_aYkG0X)*qQK zl^FRVl&WUm%tXIitJyN_);jerM!Vjt^*XY0lc;yo*!DUt3Gphj4p>?J4Bo72gdp{9 z^-zbS$*M@|53Z(A#?Q>=PUTV7d##w$G`9~ia8V?!%YTsF# wR`mtwwWZ~nK~=7qA2Q14d!V02TnX2?#unT#3C1IQAq_7RJe<1o;-m6E04P46(f|Me literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/active_admin.js b/app/assets/javascripts/active_admin.js new file mode 100644 index 0000000..d2b66c5 --- /dev/null +++ b/app/assets/javascripts/active_admin.js @@ -0,0 +1 @@ +//= require active_admin/base diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 9097d83..58ae75a 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,4 +12,6 @@ // //= require jquery //= require jquery_ujs +//= require jquery-ui +//= require underscore-min //= require_tree . diff --git a/app/assets/javascripts/bills.js b/app/assets/javascripts/bills.js new file mode 100644 index 0000000..c07a122 --- /dev/null +++ b/app/assets/javascripts/bills.js @@ -0,0 +1,169 @@ +$(document).ready( function(){ + + billitems_list = []; + + // Autocomplete + $('.code_autocomplete').on('focus', function(){ + $(this).autocomplete( + { + minLength:1, + source:'/products/code_autocomplete', + focus: function(event, ui){ + $('#code').val(ui.item.code); + $('#name').val(ui.item.name); + }, + change:function(event, ui){ + console.log(ui); + if(ui.item){ + $('#item_id').val(ui.item.id); + $('#code').val(ui.item.code); + $('#name').val(ui.item.name); + if ($('#price').val()== ""){ + $('#price').val(ui.item.price); + } + if ($('#quant').val()== ""){ + $('#quant').val(1); + } + } + } + } + ); + } +); +//billitem template +var billitem_tmpl = _.template("><%= code %><%= name %><%= price %><%= quantity %>Remove
"); + +// render bill items_list +function render_bill_items_list(){ + if (billitems_list.length){ + _.each(billitems_list, function(bi){ + $('#bill_area').append(billitem_tmpl(bi)); + });} +} +// Add to bill +function add_to_bill(){ + var billitem = { + _guid:Math.guid(), + id:$('#item_id').val(), + code:$('#code').val(), + name:$('#name').val(), + price:$('#price').val(), + quantity:$('#quant').val() + }; + $('#reset_billitem').trigger('click'); + billitems_list.push(billitem); + $('#bill_area').append(billitem_tmpl(billitem)); +} + +function calculate_total(){ + var total = _.reduce(billitems_list, function(tot, bi){ return tot+parseInt(bi.price)*parseInt(bi.quantity); }, 0); + $('#total strong').text(total); +} + +$('#add_item_2_bill').live('click', function(){ + if(parseInt($('#item_id').val())){ + add_to_bill(); + calculate_total(); + }else{ + alert('This product does not exist in the product database, please create it first.') + } +}); + +$('#reset_billitem').live('click', function(){ + _.each($('#bill_item_form .item'), function(it){ + $(it).val(''); + }); +}); + +$('#add_bill').live('click', function(evt){ + evt.preventDefault(); + if(billitems_list.length){ + $.ajax({ + url:"/bills", + data:{billitems:billitems_list}, + dataType:'json', + type:'POST', + success:function(data, textStatus, jqXHR){ + console.log(data); + if(data.success){ + $('#reset_bill').trigger('click'); + $('#reset_billitem').trigger('click'); + } + } + }); + }else{ + alert('No items were found in the bill please add some items.'); + } +}); + +// deleting items from the bill +$('.del_item').live('click',function(evt){ + evt.preventDefault(); + var ref = $($(this)[0]); + ref = ref.parent('.billitem').filter(':first'); + var guid = ref.attr("data-guid"); + ref.remove(); + billitems_list = _.reject(billitems_list, function(bi){return bi._guid == guid;}); + calculate_total(); +}); + +// Reset bill +$('#reset_bill').live('click', function(){ + $('.del_item').trigger('click'); +}); + +// external code +Math.guid = function(){ + return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) { + var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8); + return v.toString(16); + }).toUpperCase(); +}; + + +/* + // Updating subtotal on field change + function show_subtotal(){ + var price = parseInt($('#billitem_price').val()); + var numbers = parseInt($('#billitem_numbers').val()); + if (price && numbers){ + $('#subtotal').text("Subtotal : " + price*numbers) + } + } + + $('#bill_input_form #billitem_price').on('change', show_subtotal); + $('#bill_input_form #billitem_numbers').on('change', show_subtotal); + + // Respond on successful write to billitem & bill + $(function(){ + $('#bill_input_form') + .bind('ajax:success', function(e, data, status, xhr){ + if(data.success){ + $('#bill_table').append(bill_record(data)); + } + return false + }) + .bind('ajax:error', function(e, xhr, status, error){ + console.log("error json: "+ xhr.respomseText); + }) + + }) + + // debug + $('input[name="commit"]').on('click', function(){console.log('Triggered submit');}); + + // Delete a bill item from the bill + $('.delete_bill_item').on('click', function(){ + id = $(this).parent('tr').attr('id'); + this_record = $(this); + $.ajax({ + url:"/bills/"+id+"/destroy_item.json", + succeess:function(data){ + if(data.success){ + this_record.remove(); + } + } + }); + }); + */ +}) diff --git a/app/assets/javascripts/bootstrap-modal.js b/app/assets/javascripts/bootstrap-modal.js new file mode 100644 index 0000000..bceb303 --- /dev/null +++ b/app/assets/javascripts/bootstrap-modal.js @@ -0,0 +1,210 @@ +/* ========================================================= + * bootstrap-modal.js v2.0.1 + * http://twitter.github.com/bootstrap/javascript.html#modals + * ========================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================= */ + + +!function( $ ){ + + "use strict" + + /* MODAL CLASS DEFINITION + * ====================== */ + + var Modal = function ( content, options ) { + this.options = options + this.$element = $(content) + .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) + } + + Modal.prototype = { + + constructor: Modal + + , toggle: function () { + return this[!this.isShown ? 'show' : 'hide']() + } + + , show: function () { + var that = this + + if (this.isShown) return + + $('body').addClass('modal-open') + + this.isShown = true + this.$element.trigger('show') + + escape.call(this) + backdrop.call(this, function () { + var transition = $.support.transition && that.$element.hasClass('fade') + + !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position + + that.$element + .show() + + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element.addClass('in') + + transition ? + that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : + that.$element.trigger('shown') + + }) + } + + , hide: function ( e ) { + e && e.preventDefault() + + if (!this.isShown) return + + var that = this + this.isShown = false + + $('body').removeClass('modal-open') + + escape.call(this) + + this.$element + .trigger('hide') + .removeClass('in') + + $.support.transition && this.$element.hasClass('fade') ? + hideWithTransition.call(this) : + hideModal.call(this) + } + + } + + + /* MODAL PRIVATE METHODS + * ===================== */ + + function hideWithTransition() { + var that = this + , timeout = setTimeout(function () { + that.$element.off($.support.transition.end) + hideModal.call(that) + }, 500) + + this.$element.one($.support.transition.end, function () { + clearTimeout(timeout) + hideModal.call(that) + }) + } + + function hideModal( that ) { + this.$element + .hide() + .trigger('hidden') + + backdrop.call(this) + } + + function backdrop( callback ) { + var that = this + , animate = this.$element.hasClass('fade') ? 'fade' : '' + + if (this.isShown && this.options.backdrop) { + var doAnimate = $.support.transition && animate + + this.$backdrop = $('
') + .appendTo(document.body) + + if (this.options.backdrop != 'static') { + this.$backdrop.click($.proxy(this.hide, this)) + } + + if (doAnimate) this.$backdrop[0].offsetWidth // force reflow + + this.$backdrop.addClass('in') + + doAnimate ? + this.$backdrop.one($.support.transition.end, callback) : + callback() + + } else if (!this.isShown && this.$backdrop) { + this.$backdrop.removeClass('in') + + $.support.transition && this.$element.hasClass('fade')? + this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) : + removeBackdrop.call(this) + + } else if (callback) { + callback() + } + } + + function removeBackdrop() { + this.$backdrop.remove() + this.$backdrop = null + } + + function escape() { + var that = this + if (this.isShown && this.options.keyboard) { + $(document).on('keyup.dismiss.modal', function ( e ) { + e.which == 27 && that.hide() + }) + } else if (!this.isShown) { + $(document).off('keyup.dismiss.modal') + } + } + + + /* MODAL PLUGIN DEFINITION + * ======================= */ + + $.fn.modal = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('modal') + , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) + if (!data) $this.data('modal', (data = new Modal(this, options))) + if (typeof option == 'string') data[option]() + else if (options.show) data.show() + }) + } + + $.fn.modal.defaults = { + backdrop: true + , keyboard: true + , show: true + } + + $.fn.modal.Constructor = Modal + + + /* MODAL DATA-API + * ============== */ + + $(function () { + $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { + var $this = $(this), href + , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data()) + + e.preventDefault() + $target.modal(option) + }) + }) + +}( window.jQuery ); \ No newline at end of file diff --git a/app/assets/javascripts/bootstrap-typeahead.js b/app/assets/javascripts/bootstrap-typeahead.js new file mode 100644 index 0000000..5031559 --- /dev/null +++ b/app/assets/javascripts/bootstrap-typeahead.js @@ -0,0 +1,271 @@ +/* ============================================================= + * bootstrap-typeahead.js v2.0.1 + * http://twitter.github.com/bootstrap/javascript.html#typeahead + * ============================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + +!function( $ ){ + + "use strict" + + var Typeahead = function ( element, options ) { + this.$element = $(element) + this.options = $.extend({}, $.fn.typeahead.defaults, options) + this.matcher = this.options.matcher || this.matcher + this.sorter = this.options.sorter || this.sorter + this.highlighter = this.options.highlighter || this.highlighter + this.$menu = $(this.options.menu).appendTo('body') + this.source = this.options.source + this.shown = false + this.listen() + } + + Typeahead.prototype = { + + constructor: Typeahead + + , select: function () { + var val = this.$menu.find('.active').attr('data-value') + this.$element.val(val) + return this.hide() + } + + , show: function () { + var pos = $.extend({}, this.$element.offset(), { + height: this.$element[0].offsetHeight + }) + + this.$menu.css({ + top: pos.top + pos.height + , left: pos.left + }) + + this.$menu.show() + this.shown = true + return this + } + + , hide: function () { + this.$menu.hide() + this.shown = false + return this + } + + , lookup: function (event) { + var that = this + , items + , q + + this.query = this.$element.val() + + if (!this.query) { + return this.shown ? this.hide() : this + } + + items = $.grep(this.source, function (item) { + if (that.matcher(item)) return item + }) + + items = this.sorter(items) + + if (!items.length) { + return this.shown ? this.hide() : this + } + + return this.render(items.slice(0, this.options.items)).show() + } + + , matcher: function (item) { + return ~item.toLowerCase().indexOf(this.query.toLowerCase()) + } + + , sorter: function (items) { + var beginswith = [] + , caseSensitive = [] + , caseInsensitive = [] + , item + + while (item = items.shift()) { + if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) + else if (~item.indexOf(this.query)) caseSensitive.push(item) + else caseInsensitive.push(item) + } + + return beginswith.concat(caseSensitive, caseInsensitive) + } + + , highlighter: function (item) { + return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) { + return '' + match + '' + }) + } + + , render: function (items) { + var that = this + + items = $(items).map(function (i, item) { + i = $(that.options.item).attr('data-value', item) + i.find('a').html(that.highlighter(item)) + return i[0] + }) + + items.first().addClass('active') + this.$menu.html(items) + return this + } + + , next: function (event) { + var active = this.$menu.find('.active').removeClass('active') + , next = active.next() + + if (!next.length) { + next = $(this.$menu.find('li')[0]) + } + + next.addClass('active') + } + + , prev: function (event) { + var active = this.$menu.find('.active').removeClass('active') + , prev = active.prev() + + if (!prev.length) { + prev = this.$menu.find('li').last() + } + + prev.addClass('active') + } + + , listen: function () { + this.$element + .on('blur', $.proxy(this.blur, this)) + .on('keypress', $.proxy(this.keypress, this)) + .on('keyup', $.proxy(this.keyup, this)) + + if ($.browser.webkit || $.browser.msie) { + this.$element.on('keydown', $.proxy(this.keypress, this)) + } + + this.$menu + .on('click', $.proxy(this.click, this)) + .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) + } + + , keyup: function (e) { + e.stopPropagation() + e.preventDefault() + + switch(e.keyCode) { + case 40: // down arrow + case 38: // up arrow + break + + case 9: // tab + case 13: // enter + if (!this.shown) return + this.select() + break + + case 27: // escape + this.hide() + break + + default: + this.lookup() + } + + } + + , keypress: function (e) { + e.stopPropagation() + if (!this.shown) return + + switch(e.keyCode) { + case 9: // tab + case 13: // enter + case 27: // escape + e.preventDefault() + break + + case 38: // up arrow + e.preventDefault() + this.prev() + break + + case 40: // down arrow + e.preventDefault() + this.next() + break + } + } + + , blur: function (e) { + var that = this + e.stopPropagation() + e.preventDefault() + setTimeout(function () { that.hide() }, 150) + } + + , click: function (e) { + e.stopPropagation() + e.preventDefault() + this.select() + } + + , mouseenter: function (e) { + this.$menu.find('.active').removeClass('active') + $(e.currentTarget).addClass('active') + } + + } + + + /* TYPEAHEAD PLUGIN DEFINITION + * =========================== */ + + $.fn.typeahead = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('typeahead') + , options = typeof option == 'object' && option + if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.typeahead.defaults = { + source: [] + , items: 8 + , menu: '
    ' + , item: '
    • ' + } + + $.fn.typeahead.Constructor = Typeahead + + + /* TYPEAHEAD DATA-API + * ================== */ + + $(function () { + $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { + var $this = $(this) + if ($this.data('typeahead')) return + e.preventDefault() + $this.typeahead($this.data()) + }) + }) + +}( window.jQuery ); \ No newline at end of file diff --git a/app/assets/javascripts/products.js b/app/assets/javascripts/products.js new file mode 100644 index 0000000..1b6a541 --- /dev/null +++ b/app/assets/javascripts/products.js @@ -0,0 +1,122 @@ +$(document).ready(function(){ + product_tmpl = _.template('\ + \ + <%=id%> \ + <%=code%> \ + <%=name%> \ + <%=price%> \ + <%=quantity%>\ + \ + \ + '); + var p_form = $('#new_product_form'); + $('#add_to_products').live('click',function(evt){ + evt.preventDefault(); + var product = { + code:$('#p_code', p_form).val(), + name:$('#p_name', p_form).val(), + price:parseInt($('#p_price', p_form).val()), + quantity:parseInt($('#p_quant', p_form).val()) + }; + $.ajax({ + url:'/products', + data:JSON.stringify(product), + type:'POST', + contentType:'application/json', + dataType:'json', + success:function(data){ + if(data.success){ + $('#reset_new_product').trigger('click'); + $('#products_list').prepend(product_tmpl(data.product)); + }else{ + alert(data.msg); + } + }, + }) + }); + var modal_template = _.template(' \ +
    \ + ×\ +

    Edit product

    \ +
    \ +
    \ +
    \ + >\ + \ + >\ + \ + >\ + \ + >\ + \ + >\ +
    \ +
    \ +
    \ +
    \ + Delete\ + Update\ +
    \ +
    \ + '); + $('.list_item_edit').live('click', function(evt){ + var product_id = $(this).attr('id'); + $(this).parent('.product').addClass('editing'); + $.ajax({ + url:'/products/' + product_id, + type:'GET', + contentType:'application/json', + dataType:'json', + success:function(data){ + if(data.success){ + $('#modalEdit').html(modal_template(data.product)); + $('#modalEdit').modal('show'); + } + } + }); + }); + + $('#update_product').live('click', function(evt){ + evt.preventDefault(); + var product ={ + id:parseInt($('#edit_product_form #e_id').val()), + code:$('#edit_product_form #e_code').val(), + name:$('#edit_product_form #e_name').val(), + price:parseInt($('#edit_product_form #e_price').val()), + quantity:parseInt($('#edit_product_form #e_quant').val()) + }; + $.ajax({ + url:'/products/' + product.id, + type:'PUT', + data:JSON.stringify(product), + contentType:'application/json', + dataType:'json', + success:function(data){ + if(data.success){ + $('#modalEdit').modal('hide'); + $('.editing').remove(); + $('#products_list').prepend(product_tmpl(data.product)); + } + } + }); + }); + + $('#delete_product').live('click', function(evt){ + console.log('delete product'); + evt.preventDefault(); + var id=parseInt($('#edit_product_form #e_id').val()); + $.ajax({ + url:'/products/' + id, + type:'DELETE', + contentType:'application/json', + dataType:'json', + success:function(data){ + if(data.success){ + $('#modalEdit').modal('hide'); + $('.editing').remove(); + } + } + }); + }); + +}); diff --git a/app/assets/stylesheets/active_admin.css.scss b/app/assets/stylesheets/active_admin.css.scss new file mode 100644 index 0000000..9b2dc9d --- /dev/null +++ b/app/assets/stylesheets/active_admin.css.scss @@ -0,0 +1,6 @@ +// Active Admin CSS Styles +@import "active_admin/mixins"; +@import "active_admin/base"; + +// To customize the Active Admin interfaces, add your +// styles here: diff --git a/app/assets/stylesheets/bills.css.scss b/app/assets/stylesheets/bills.css.scss new file mode 100644 index 0000000..9e195c8 --- /dev/null +++ b/app/assets/stylesheets/bills.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the bills controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/products.css.scss b/app/assets/stylesheets/products.css.scss new file mode 100644 index 0000000..ba440af --- /dev/null +++ b/app/assets/stylesheets/products.css.scss @@ -0,0 +1,8 @@ +// Place all the styles related to the Products controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ +.editing{ + background-color:yellow; + opacity:.80; + filter:"alpha(80)"; +} diff --git a/app/controllers/bills_controller.rb b/app/controllers/bills_controller.rb new file mode 100644 index 0000000..40c6424 --- /dev/null +++ b/app/controllers/bills_controller.rb @@ -0,0 +1,20 @@ +class BillsController < ApplicationController + def new + @bill = Bill.new + @billitem = Billitem.new + end + + def create + @bill= Bill.create + items = params[:billitems] + items.each do |item| + item = item[1] # array of objects turned to hash with the index as the key. The value is the actual object + @bill.new_item(item) + Product.sell(item) + end + if @bill.save! + render :json => {success:true} + end + + end +end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb new file mode 100644 index 0000000..1b847a6 --- /dev/null +++ b/app/controllers/products_controller.rb @@ -0,0 +1,49 @@ +class ProductsController < ApplicationController + http_basic_authenticate_with :name => "theshop", :password => "theshop", :except => [:code_autocomplete, :products_list] + + def code_autocomplete + @items = Product.where('code like ?', params[:term].upcase+"%") + items = [] + @items.each {|i| + items << {label:i.code, id:i.id, code:i.code, name:i.name, price:i.price} + } + render :json => items + end + + def index + @products = Product.all + end + + def products_list + @products = Product.all + end + + def update + @product = Product.find(params[:product][:id]) + if @product.update_attributes(params[:product]) + render :json => {success:true, product:@product} + else + render :json => {success:false} + end + end + + def create + @product = Product.where({code:params[:product][:code].upcase}).first() + if @product.nil? + params[:product][:code] = params[:product][:code].upcase + product = Product.create(params[:product]) + render :json => {success:true, product:product} + else + render :json => {success:false, msg:"Save failed : Product already exists, edit it from the product database."} + end + end + + def destroy + Product.find(params[:id]).destroy + render :json => {success:true} + end + + def show + render :json => {success:true, product:Product.find(params[:id])} + end +end diff --git a/app/helpers/bills_helper.rb b/app/helpers/bills_helper.rb new file mode 100644 index 0000000..2c9967d --- /dev/null +++ b/app/helpers/bills_helper.rb @@ -0,0 +1,2 @@ +module BillsHelper +end diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb new file mode 100644 index 0000000..ab5c42b --- /dev/null +++ b/app/helpers/products_helper.rb @@ -0,0 +1,2 @@ +module ProductsHelper +end diff --git a/app/models/admin_user.rb b/app/models/admin_user.rb new file mode 100644 index 0000000..039464f --- /dev/null +++ b/app/models/admin_user.rb @@ -0,0 +1,9 @@ +class AdminUser < ActiveRecord::Base + # Include default devise modules. Others available are: + # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, + :recoverable, :rememberable, :trackable, :validatable + + # Setup accessible (or protected) attributes for your model + attr_accessible :email, :password, :password_confirmation, :remember_me +end diff --git a/app/models/bill.rb b/app/models/bill.rb index b2609a2..7f94f40 100644 --- a/app/models/bill.rb +++ b/app/models/bill.rb @@ -1,2 +1,7 @@ class Bill < ActiveRecord::Base + has_many :billitems + + def new_item(item) + self.billitems.create({product_id:item[:id], price:item[:price], quant:item[:quantity]}) + end end diff --git a/app/models/billitem.rb b/app/models/billitem.rb index c2eabdf..300fc45 100644 --- a/app/models/billitem.rb +++ b/app/models/billitem.rb @@ -1,2 +1,4 @@ class Billitem < ActiveRecord::Base + belongs_to :bill + has_one :product end diff --git a/app/models/product.rb b/app/models/product.rb index 077a819..56e9bc4 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,2 +1,8 @@ class Product < ActiveRecord::Base + has_many :billitems + def self.sell(item) + prod = self.find(item[:id]) + prod.update_attributes({price:item[:price], quantity:(prod.quantity - item[:quantity].to_i)}) + prod + end end diff --git a/app/views/bills/.new.html.erb.swp b/app/views/bills/.new.html.erb.swp new file mode 100644 index 0000000000000000000000000000000000000000..a048e58b787ae5fd77bff4785d94659437c45cbe GIT binary patch literal 12288 zcmeI2zi-n(6vwYwO924_36{g16Sv6#LlOx(F$4;z3<$}(_%88Pj_ux^6T$$9e}I30 zg};Y^fr&JJG z-d<~x=QjxP0~T?`>`dk5PyH}Xbfu4-d|d=|_f>o-e52j_G7M!joR2I?+_4lB?e<|t zyOEeQ0y7F5LiNuKj}Axx39KWKnnC^U7HKticdW~{bDLhhawwuMcu`m{oI3NKefCP{L5W570j?*_01=V%x`$B7nO5Sl8=bk;U>vY?4<|zF*swZKp>sk&Y zm~mzIDI1Hn%kq^f!%vus;9PJXUI{JC>IIBqI>>|Xg@UPh^fpv9OU33pRB@U(U9wzc zZn5sR6kCSJlwjZs8J45i84ahFWenxm$)MS_=a;Esi!$ZM{yd;#q}&gZpPF0zKKU219jN_3ytJ(#a>ic5)ZR;`SZ)KD``M8`4WrO7w( zC}k1cCL!}h5Qki-j`P^sq?yjUtH{F5LKN^;hf9?7#X`9K+*WkzpT~;WXff2o%v6p< zZ3o-RD%0{~z8GpRGZmriyvI@#`|&6Vg%R|uGy}=Gh)xsAI@NyBlRRtwSzc}1bSHhB TxmXkQYkAAyr)ijsgaZ3-9HV@k literal 0 HcmV?d00001 diff --git a/app/views/bills/new.html.erb b/app/views/bills/new.html.erb new file mode 100644 index 0000000..4fba431 --- /dev/null +++ b/app/views/bills/new.html.erb @@ -0,0 +1,40 @@ +
    +
      +
    • + <%= link_to "Bill", new_bill_path %> +
      • +
    • + <%= link_to "Products list", products_list_products_path %> +
      • +
    • + <%= link_to "Products management", products_path %> +
      • +
    +
    +
    +
    + + + + + +
    + Reset + Add +
    +
    + +

    Bill area

    +
    +
    + +
    + +
    + Clear + Save +
    +

    Total :

    +
    + + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a17417a..f3fdffe 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,8 +7,6 @@ <%= csrf_meta_tags %> - -<%= yield %> - + <%= yield %> diff --git a/app/views/products/._product.html.erb.swp b/app/views/products/._product.html.erb.swp new file mode 100644 index 0000000000000000000000000000000000000000..9d67863072591c3808041c020366f75372a17698 GIT binary patch literal 12288 zcmeI&y-ve05C`xp6AXL^7#U1Z#gwKW14twp*ccEnfY^$OQ)-kZA#p)nU|{4~cm`gC zi3dU0B>|-pg%$W)IytfLF7a=R+Vkeg-agxEbV!dSqNC^ggNM~Nz0MH@eIAR9o1Lj6 z7zI(1=2LUb=55i?In0vFFi^R(E2Bup7aucEQ|DTSH@TB$i5QxcZgJJA&LUw;3;ED}BHP&#&W zkd7yvb5`W;ntTihKmY;|fB*y_009U<00I#BM*^;sr#$w_t&U=qF_*I-;(6{_Ca=XJ znX9f;;h-A|sVvsd!k)Le$)xZsx9+j>|K3utx^MZeEX!q(#P+zxcO9vN`=r~Ou4T&S z6YQ%YkCjv--J$N4J(uN$P948ltFcx7s7XM8$4=7VabS(sY*&SD3Ns1}-q XpA1c4ETa literal 0 HcmV?d00001 diff --git a/app/views/products/_product.html.erb b/app/views/products/_product.html.erb new file mode 100644 index 0000000..8119c99 --- /dev/null +++ b/app/views/products/_product.html.erb @@ -0,0 +1,8 @@ + + <%=product.id%> + <%=product.code%> + <%=product.name%> + <%=product.price%> + <%=product.quantity%> + + diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb new file mode 100644 index 0000000..a6a2c55 --- /dev/null +++ b/app/views/products/index.html.erb @@ -0,0 +1,43 @@ +
    +
      +
    • + <%= link_to "Bill", new_bill_path %> +
      • +
    • + <%= link_to "Products list", products_list_products_path %> +
      • +
    • + <%= link_to "Products management", products_path %> +
      • +
    +
    +
    +
    +
    + + + + +
    + Reset + Add +
    +
    +
    + + + Id + Code + Name + Price + Quantity + Edit + +
    +
    +
    + <%= render :partial => 'product', :collection => @products %> + +
    +
    + diff --git a/app/views/products/products_list.html.erb b/app/views/products/products_list.html.erb new file mode 100644 index 0000000..214a1fa --- /dev/null +++ b/app/views/products/products_list.html.erb @@ -0,0 +1,21 @@ +
    +
      +
    • + <%= link_to "Bill", new_bill_path %> +
      • +
    • + <%= link_to "Products list", products_list_products_path%> +
      • +
    • + <%= link_to "Products management", products_path %> +
      • +
    +
    +<%= @products.each do |product|%> + + <%=product.code%> + <%=product.name%> + <%=product.price%> + <%=product.quantity%> + +<%end%> diff --git a/config/environments/.production.rb.swp b/config/environments/.production.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..c3fffcc90da4f545322f213b1ecd086fe84880da GIT binary patch literal 12288 zcmeHN&x;&I6z&Afu9~Q*pvTIFup{pF<_BUj5Ok9mO-RVPlMO49v^Cw;Gqu}O)v2o9 z*+GprFl0D*3-CR_f%kwDz$`EW{P=hj-2zHr2Dm#LMLz?d z12=&izt^mGA`!EROLDNHMtYvV5^+;e;rN6*+m z8-Z!K>H5;L)=-;G9A%qg0e;%5EVXfQCQ7)>={Oo(YAfwzKJv?T5Fm)zy-oL0T1Yb^ zdeS;!M8*pGp@f-SLmoe+;+z*nm#3Q)sxy`FM#=w+bT<<@uL_qGI^{^furCzjn8%eZ zYHw16fF+6XTvsZqNq9r~gf)-tu0c$YVb&V(O*mO-y;+skGsM*h*M1#(0Le`^5e1R5 zlRnB3&n(ZyVL#lgQx7A|fzHI#1H08!2ooDFtw_dYl+I;FKOmf&zg8Ftw7etF+Ea{_=!NpwPxw5^q)C3^5 z`JgOBj40+NDYwFGQ6cM`$pP;PxMJO?KnDrLUHf&3Z}CoQWa*G$qX%%d4h$q1H1d>N zDNp+-ct?$a5+8^`GBM({TRHSb48i@mm)?!Dbm62{#7XwX!s#eHVimrzi##7NWWeG}4?$99H&|sD2 z=$xdFQuY~~Ute5?7scYL$Rzs4%|jX}5ehln_R&x8A`i4Sw+ z6?>VDjn*#S&{DPL%BqY0Z<=w==W85cEijox?@{0GWb94SdG4@X`df{-)_StGdU :print + # + # To load a javascript file: + # config.register_javascript 'my_javascript.js' +end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000..920afb7 --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,223 @@ +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # note that it will be overwritten if you use your own mailer class with default "from" parameter. + config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com" + + # Configure the class responsible to send e-mails. + # config.mailer = "Devise::Mailer" + + # Automatically apply schema changes in tableless databases + config.apply_schema = false + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [ :email ] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [ :email ] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [ :email ] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Basic Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:token]` will + # enable it only for token authentication. + # config.http_authenticatable = false + + # If http headers should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. "Application" by default. + # config.http_authentication_realm = "Application" + + # It will change confirmation, password recovery and other workflows + # to behave the same regardless if the e-mail provided was right or wrong. + # Does not affect registerable. + # config.paranoid = true + + # By default Devise will store the user in session. You can skip storage for + # :http_auth and :token_auth by adding those symbols to the array below. + # Notice that if you are skipping storage for all authentication paths, you + # may want to disable generating routes to Devise's sessions controller by + # passing :skip => :sessions to `devise_for` in your config/routes.rb + config.skip_session_storage = [:http_auth] + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 10. If + # using other encryptors, it sets how many times you want the password re-encrypted. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. + config.stretches = Rails.env.test? ? 1 : 10 + + # Setup a pepper to generate the encrypted password. + # config.pepper = "7fdac58cf6be3a03f6c5ad66d1fb0aa1da36d798ca2c336a6ac56e3ec0eaf5476485718577ea460266e8265c347c3bc5ed29e5d81f1a1cede6e0db00e1fddced" + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming his account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming his account, + # access will be blocked just in the third day. Default is 0.days, meaning + # the user cannot access the website without confirming his account. + # config.allow_unconfirmed_access_for = 2.days + + # If true, requires any email changes to be confirmed (exctly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed new email is stored in + # unconfirmed email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [ :email ] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # If true, uses the password salt as remember token. This should be turned + # to false if you are not using database authenticatable. + config.use_salt_as_remember_token = true + + # Options to be passed to the created cookie. For instance, you can set + # :secure => true in order to force SSL only cookies. + # config.cookie_options = {} + + # ==> Configuration for :validatable + # Range for password length. Default is 6..128. + # config.password_length = 6..128 + + # Email regex used to validate email formats. It simply asserts that + # an one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + # config.email_regexp = /\A[^@]+@[^@]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [ :email ] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [ :email ] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # ==> Configuration for :encryptable + # Allow you to use another encryption algorithm besides bcrypt (default). You can use + # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1, + # :authlogic_sha512 (then you should set stretches above to 20 for default behavior) + # and :restful_authentication_sha1 (then you should set stretches to 10, and copy + # REST_AUTH_SITE_KEY to pepper) + # config.encryptor = :sha512 + + # ==> Configuration for :token_authenticatable + # Defines name of the authentication token params key + # config.token_authentication_key = :auth_token + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Configure sign_out behavior. + # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope). + # The default is true, which means any logout action will sign out all active scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ["*/*", :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(:scope => :user).unshift :some_external_strategy + # end +end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 0000000..73df488 --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,57 @@ +# Additional translations at https://github.com/plataformatec/devise/wiki/I18n + +en: + errors: + messages: + expired: "has expired, please request a new one" + not_found: "not found" + already_confirmed: "was already confirmed, please try signing in" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" + + devise: + failure: + already_authenticated: 'You are already signed in.' + unauthenticated: 'You need to sign in or sign up before continuing.' + unconfirmed: 'You have to confirm your account before continuing.' + locked: 'Your account is locked.' + invalid: 'Invalid email or password.' + invalid_token: 'Invalid authentication token.' + timeout: 'Your session expired, please sign in again to continue.' + inactive: 'Your account was not activated yet.' + sessions: + signed_in: 'Signed in successfully.' + signed_out: 'Signed out successfully.' + passwords: + send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.' + updated: 'Your password was changed successfully. You are now signed in.' + updated_not_active: 'Your password was changed successfully.' + send_paranoid_instructions: "If your e-mail exists on our database, you will receive a password recovery link on your e-mail" + confirmations: + send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.' + send_paranoid_instructions: 'If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes.' + confirmed: 'Your account was successfully confirmed. You are now signed in.' + registrations: + signed_up: 'Welcome! You have signed up successfully.' + signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.' + signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.' + signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.' + updated: 'You updated your account successfully.' + update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address." + destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.' + unlocks: + send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.' + unlocked: 'Your account has been unlocked successfully. Please sign in to continue.' + send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.' + omniauth_callbacks: + success: 'Successfully authorized from %{kind} account.' + failure: 'Could not authorize you from %{kind} because "%{reason}".' + mailer: + confirmation_instructions: + subject: 'Confirmation instructions' + reset_password_instructions: + subject: 'Reset password instructions' + unlock_instructions: + subject: 'Unlock Instructions' diff --git a/config/routes.rb b/config/routes.rb index ec32827..0a1f814 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,58 +1,14 @@ Billing::Application.routes.draw do - # The priority is based upon order of creation: - # first created -> highest priority. - - # Sample of regular route: - # match 'products/:id' => 'catalog#view' - # Keep in mind you can assign values other than :controller and :action - - # Sample of named route: - # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase - # This route can be invoked with purchase_url(:id => product.id) - - # Sample resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Sample resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Sample resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Sample resource route with more complex sub-resources - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', :on => :collection - # end - # end - - # Sample resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end - - # You can have the root of your site routed with "root" - # just remember to delete public/index.html. - # root :to => 'welcome#index' - - # See how all your routes lay out with "rake routes" - - # This is a legacy wild controller route that's not recommended for RESTful applications. - # Note: This route will make all actions in every controller accessible via GET requests. - # match ':controller(/:action(/:id))(.:format)' + ActiveAdmin.routes(self) + + devise_for :admin_users, ActiveAdmin::Devise.config + + resources :products do + collection do + get 'code_autocomplete' + get 'products_list' + end + end + resources :bills + root :to => "bills#new" end diff --git a/db/migrate/20120409041606_rename_product_to_name_in_products.rb b/db/migrate/20120409041606_rename_product_to_name_in_products.rb new file mode 100644 index 0000000..5e5bd69 --- /dev/null +++ b/db/migrate/20120409041606_rename_product_to_name_in_products.rb @@ -0,0 +1,9 @@ +class RenameProductToNameInProducts < ActiveRecord::Migration + def up + rename_column :products, :product, :name + end + + def down + rename_column :products, :name, :product + end +end diff --git a/db/migrate/20120412135404_devise_create_admin_users.rb b/db/migrate/20120412135404_devise_create_admin_users.rb new file mode 100644 index 0000000..59a2286 --- /dev/null +++ b/db/migrate/20120412135404_devise_create_admin_users.rb @@ -0,0 +1,52 @@ +class DeviseCreateAdminUsers < ActiveRecord::Migration + def change + create_table(:admin_users) do |t| + ## Database authenticatable + t.string :email, :null => false, :default => "" + t.string :encrypted_password, :null => false, :default => "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + t.integer :sign_in_count, :default => 0 + t.datetime :current_sign_in_at + t.datetime :last_sign_in_at + t.string :current_sign_in_ip + t.string :last_sign_in_ip + + ## Encryptable + # t.string :password_salt + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + ## Token authenticatable + # t.string :authentication_token + + + t.timestamps + end + + # Create a default user + AdminUser.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password') + + add_index :admin_users, :email, :unique => true + add_index :admin_users, :reset_password_token, :unique => true + # add_index :admin_users, :confirmation_token, :unique => true + # add_index :admin_users, :unlock_token, :unique => true + # add_index :admin_users, :authentication_token, :unique => true + end +end diff --git a/db/migrate/20120412192412_create_admin_notes.rb b/db/migrate/20120412192412_create_admin_notes.rb new file mode 100644 index 0000000..a2d3247 --- /dev/null +++ b/db/migrate/20120412192412_create_admin_notes.rb @@ -0,0 +1,16 @@ +class CreateAdminNotes < ActiveRecord::Migration + def self.up + create_table :admin_notes do |t| + t.references :resource, :polymorphic => true, :null => false + t.references :admin_user, :polymorphic => true + t.text :body + t.timestamps + end + add_index :admin_notes, [:resource_type, :resource_id] + add_index :admin_notes, [:admin_user_type, :admin_user_id] + end + + def self.down + drop_table :admin_notes + end +end diff --git a/db/migrate/20120412192413_move_admin_notes_to_comments.rb b/db/migrate/20120412192413_move_admin_notes_to_comments.rb new file mode 100644 index 0000000..296aa43 --- /dev/null +++ b/db/migrate/20120412192413_move_admin_notes_to_comments.rb @@ -0,0 +1,25 @@ +class MoveAdminNotesToComments < ActiveRecord::Migration + def self.up + remove_index :admin_notes, [:admin_user_type, :admin_user_id] + rename_table :admin_notes, :active_admin_comments + rename_column :active_admin_comments, :admin_user_type, :author_type + rename_column :active_admin_comments, :admin_user_id, :author_id + add_column :active_admin_comments, :namespace, :string + add_index :active_admin_comments, [:namespace] + add_index :active_admin_comments, [:author_type, :author_id] + + # Update all the existing comments to the default namespace + say "Updating any existing comments to the #{ActiveAdmin.application.default_namespace} namespace." + execute "UPDATE active_admin_comments SET namespace='#{ActiveAdmin.application.default_namespace}'" + end + + def self.down + remove_index :active_admin_comments, :column => [:author_type, :author_id] + remove_index :active_admin_comments, :column => [:namespace] + remove_column :active_admin_comments, :namespace + rename_column :active_admin_comments, :author_id, :admin_user_id + rename_column :active_admin_comments, :author_type, :admin_user_type + rename_table :active_admin_comments, :admin_notes + add_index :admin_notes, [:admin_user_type, :admin_user_id] + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000..5416425 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended to check this file into your version control system. + +ActiveRecord::Schema.define(:version => 20120409041606) do + + create_table "billitems", :force => true do |t| + t.integer "bill_id" + t.integer "product_id" + t.integer "price" + t.integer "quant" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "bills", :force => true do |t| + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "products", :force => true do |t| + t.string "code" + t.string "name" + t.integer "price" + t.integer "quantity" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + +end diff --git a/public/index.html b/public/index.html deleted file mode 100644 index a1d5099..0000000 --- a/public/index.html +++ /dev/null @@ -1,241 +0,0 @@ - - - - Ruby on Rails: Welcome aboard - - - - -
    - - -
    - - - - -
    -

    Getting started

    -

    Here’s how to get rolling:

    - -
      -
    1. -

      Use rails generate to create your models and controllers

      -

      To see all available options, run it without parameters.

      -
      2. - -
    2. -

      Set up a default route and remove public/index.html

      -

      Routes are set up in config/routes.rb.

      -
      3. - -
    3. -

      Create your database

      -

      Run rake db:create to create your database. If you're not using SQLite (the default), edit config/database.yml with your username and password.

      -
      4. -
    -
    -
    - - -
    - - diff --git a/test/fixtures/admin_users.yml b/test/fixtures/admin_users.yml new file mode 100644 index 0000000..c63aac0 --- /dev/null +++ b/test/fixtures/admin_users.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/functional/bills_controller_test.rb b/test/functional/bills_controller_test.rb new file mode 100644 index 0000000..715935e --- /dev/null +++ b/test/functional/bills_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class BillsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/functional/products_controller_test.rb b/test/functional/products_controller_test.rb new file mode 100644 index 0000000..c881fa6 --- /dev/null +++ b/test/functional/products_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ProductsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/admin_user_test.rb b/test/unit/admin_user_test.rb new file mode 100644 index 0000000..6215c04 --- /dev/null +++ b/test/unit/admin_user_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class AdminUserTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/helpers/bills_helper_test.rb b/test/unit/helpers/bills_helper_test.rb new file mode 100644 index 0000000..e6679d3 --- /dev/null +++ b/test/unit/helpers/bills_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class BillsHelperTest < ActionView::TestCase +end diff --git a/test/unit/helpers/products_helper_test.rb b/test/unit/helpers/products_helper_test.rb new file mode 100644 index 0000000..0f5beab --- /dev/null +++ b/test/unit/helpers/products_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class ProductsHelperTest < ActionView::TestCase +end