add a presents logo

For #46

Author: nathanstitt

client/skr/models/Event.coffee

@@ -17,6 +17,7 @@ class Skr.Models.Event extends Skr.Models.Base
 
     associations:
         photo:         { model: "Lanes.Models.Asset" }
+        presents_logo: { model: "Lanes.Models.Asset" }
         sku:           { model: "Sku", required: true }
         invoices:      { collection: "Invoice" }
         invoice_lines: { collection: "InvLine" }

client/skr/screens/events/Events.cjsx

@@ -1,7 +1,7 @@
 class Skr.Screens.Events extends Skr.Screens.Base
 
     syncOptions:
-        include: [ 'sku', 'photo' ]
+        include: [ 'sku', 'photo', 'presents_logo' ]
 
     modelBindings:
         event: ->
@@ -45,8 +45,12 @@ class Skr.Screens.Events extends Skr.Screens.Base
                 <LC.Input sm=12 name='venue' model={@event} />
             </BS.Row>
             <BS.Row>
-                <LC.ImageAsset sm=5 asset={@event.photo}
-                    label='Photo' size='medium' />
+                <LC.FieldSet title="Logos" sm=12>
+                    <LC.ImageAsset sm=6 asset={@event.photo}
+                        label='Photo' size='thumb' />
+                    <LC.ImageAsset sm=6 asset={@event.presents_logo}
+                        label='Presents Logo' size='thumb' />
+                </LC.FieldSet>
             </BS.Row>
 
         </LC.ScreenWrapper>

db/schema.sql

@@ -472,7 +472,7 @@ CREATE TABLE skr_events (
     id integer NOT NULL,
     code character varying NOT NULL,
     sku_id integer NOT NULL,
-    title text,
+    title text NOT NULL,
     sub_title text,
     info text,
     venue text,
@@ -2115,6 +2115,39 @@ CREATE SEQUENCE system_settings_id_seq
 ALTER SEQUENCE system_settings_id_seq OWNED BY system_settings.id;
 
 
+--
+-- Name: testers; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE testers (
+    id integer NOT NULL,
+    name character varying,
+    email character varying,
+    visits text[] DEFAULT '{}'::text[],
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: testers_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE testers_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: testers_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE testers_id_seq OWNED BY testers.id;
+
+
 --
 -- Name: id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -2416,6 +2449,13 @@ ALTER TABLE ONLY skr_vouchers ALTER COLUMN id SET DEFAULT nextval('skr_vouchers_
 ALTER TABLE ONLY system_settings ALTER COLUMN id SET DEFAULT nextval('system_settings_id_seq'::regclass);
 
 
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY testers ALTER COLUMN id SET DEFAULT nextval('testers_id_seq'::regclass);
+
+
 --
 -- Name: ar_internal_metadata_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -2784,6 +2824,14 @@ ALTER TABLE ONLY system_settings
     ADD CONSTRAINT system_settings_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: testers_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY testers
+    ADD CONSTRAINT testers_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: index_assets_on_owner_id_and_owner_type; Type: INDEX; Schema: public; Owner: -
 --
@@ -3657,6 +3705,62 @@ ALTER TABLE ONLY skr_vouchers
 
 SET search_path TO "$user", public;
 
-INSERT INTO schema_migrations (version) VALUES ('1'), ('2'), ('20120110142845'), ('20140202185309'), ('20140202193316'), ('20140202193318'), ('20140202193319'), ('20140202193700'), ('20140202194700'), ('20140213040608'), ('20140220031700'), ('20140220031800'), ('20140220190836'), ('20140220203029'), ('20140224034759'), ('20140225032853'), ('20140320030501'), ('20140321031604'), ('20140322012143'), ('20140322014401'), ('20140322023453'), ('20140322035024'), ('20140322223912'), ('20140322223920'), ('20140323001446'), ('20140327202102'), ('20140327202107'), ('20140327202207'), ('20140327202209'), ('20140327214000'), ('20140327223002'), ('20140327224000'), ('20140327224002'), ('20140330232808'), ('20140330232810'), ('20140400164729'), ('20140400164733'), ('20140401164729'), ('20140401164740'), ('20140422024010'), ('20140615031600'), ('20151121211323'), ('20160216142845'), ('20160229002044'), ('20160229041711'), ('20160307022705'), ('20160517032350'), ('20160531014306'), ('20160604195848'), ('20160605024432'), ('20160608023553'), ('20160620010455'), ('20160726004411'), ('20160805002717'), ('20161219174024');
+INSERT INTO schema_migrations (version) VALUES
+('1'),
+('2'),
+('20120110142845'),
+('20140202185309'),
+('20140202193316'),
+('20140202193318'),
+('20140202193319'),
+('20140202193700'),
+('20140202194700'),
+('20140213040608'),
+('20140220031700'),
+('20140220031800'),
+('20140220190836'),
+('20140220203029'),
+('20140224034759'),
+('20140225032853'),
+('20140320030501'),
+('20140321031604'),
+('20140322012143'),
+('20140322014401'),
+('20140322023453'),
+('20140322035024'),
+('20140322223912'),
+('20140322223920'),
+('20140323001446'),
+('20140327202102'),
+('20140327202107'),
+('20140327202207'),
+('20140327202209'),
+('20140327214000'),
+('20140327223002'),
+('20140327224000'),
+('20140327224002'),
+('20140330232808'),
+('20140330232810'),
+('20140400164729'),
+('20140400164733'),
+('20140401164729'),
+('20140401164740'),
+('20140422024010'),
+('20140615031600'),
+('20150220015108'),
+('20151121211323'),
+('20160216142845'),
+('20160229002044'),
+('20160229041711'),
+('20160307022705'),
+('20160517032350'),
+('20160531014306'),
+('20160604195848'),
+('20160605024432'),
+('20160608023553'),
+('20160620010455'),
+('20160726004411'),
+('20160805002717'),
+('20161219174024');
 
 

lib/skr/models/event.rb

@@ -5,7 +5,12 @@ class Event < Model
         has_code_identifier from: :title
 
         has_one :photo, as: :owner, :class_name=>'Lanes::Asset',
-                export: { writable: false }, :dependent => :destroy
+                export: { writable: true }, dependent: :destroy
+
+        has_one :presents_logo,  -> { where owner_type: "PresentsLogo"},
+                class_name: 'Lanes::Asset', foreign_key: :owner_id,
+                foreign_type: :owner_type, dependent: :destroy,
+                export: { writable: true }
 
         belongs_to :sku, export: { writable: true }
 
@@ -26,6 +31,10 @@ def qty_remaining
             end
         end
 
+        def get_presents_logo
+            presents_logo.present? ? presents_logo : Location.default.get_logo
+        end
+
     end
 
 end

spec/server/models/event_spec.rb

@@ -28,4 +28,22 @@ class EventSpec < Skr::TestCase
         assert_equal event.invoices.first, invoice
     end
 
+    it 'can set photos' do
+        fixtures_path = Pathname.new(__FILE__).dirname.join("../../fixtures")#.expand_path
+
+        event = skr_event(:top)
+        Tempfile.open do |tf1|
+            tf1.write fixtures_path.join('generic-band.jpg').read
+            tf1.rewind
+            Tempfile.open do |tf2|
+                tf2.write fixtures_path.join('stockor.png').read
+                tf2.rewind
+                event.build_photo(file: tf1)
+                event.build_presents_logo(file: tf2)
+                assert_saves event
+            end
+        end
+
+    end
+
 end

templates/print/types/invoice/ticket.tex.erb

@@ -13,7 +13,7 @@
 
 \renewcommand{\ticketdefault}{%
   \put(49,45){
-<% if (logo = @invoice.location.get_logo).present? -%>
+<% if (logo = event.get_presents_logo).present? -%>
       \raisebox{-1mm}{\includegraphics[height=8mm]{<%= logo.file[:original].download.path %>}}
 <% end -%>
 \textsf{\Huge presents:}