ish_models 0.0.33.267 → 0.0.33.269

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 562cb493212497cffadce51e4ff62fdb5cd7986020944767635fb9ba06ec90c8
-  data.tar.gz: 7991f49f62f2d2553bc9822adaa4198f19f68a3947a1dfcd9624b928a3eeaed6
+  metadata.gz: c8a7d7dce5c47ec5fd14dd24b9058caa39fe2274e97d7ba92fc12dea2b5409dc
+  data.tar.gz: 44b14bc9b6102fe774e803a52cc1eb58e60e19c3146a9ca3cde251689b96449e
 SHA512:
-  metadata.gz: 2bc7c42c23d84036beaa7df47fa2c8d4ca8438dcf0dba760f3691e5470fdaed0483eb4f2372ed1fc4090b69ff21d3078b9503cef2f32e414ab77c7153746df86
-  data.tar.gz: ff6b3f6331e2d10da1e1a4c82d408000f5555066875f28d5310630d18e230bf2a17e67ab8f3e1b43e0792501a0aac15f6e8f65cdaf6d1c5703264ecc511d145b
+  metadata.gz: 10afe05f48b979bb9bf9e872190bf5895dda533cf96dc14bb2d7b043babf22f1e27dc2be6cc9795185582e45feaa3f835e1f9a0a906be905957c81077512f429
+  data.tar.gz: 605c986b2ee54ed153fe994a9a21a01a1ba9a149319bec7a4d829eea04e19fc1223987f9f211d6bc9dd8092f33cb5cef8d02357b5254bdfb19634f5871bf5e08

data/lib/gameui/asset3d.rb

@@ -9,6 +9,7 @@ class ::Gameui::Asset3d
   include Ish::Utils
 
   belongs_to :marker,       class_name: 'Gameui::Marker', optional: true
+  belongs_to :invoice,      class_name: 'Ish::Invoice',   optional: true
 
   has_mongoid_attached_file :object,
                             :storage => :s3,
@@ -22,7 +23,7 @@ class ::Gameui::Asset3d
 
   def export_fields
     %w|
-      marker_id
+      marker_id invoice_id
       asset3d_file_name asset3d_content_type asset3d_file_size asset3d_updated_at asset3d_fingerprint
     |;
   end

data/lib/ish/invoice.rb

@@ -23,22 +23,26 @@ class Ish::Invoice
     Leadset.find leadset_id
   end
 
-  field :number, type: Integer, default: 100
-  increments :number
+  field :number, type: Integer
 
   field :month_on, type: Date
 
+  has_one :asset, class_name: '::Gameui::Asset3d' ## the pdf
+
+  def filename
+    "invoice-#{number}.pdf"
+  end
+
   # field :amount_cents, type: Integer
-  # has_many :payments, :class_name => 'Ish::Payment'
-  # field :paid_amount_cents, type: Integer, :default => 0 ## @TODO: unused? _vp_ 2023-08-18
-  # field :description, type: String
-  # field :items, type: Array
+
+  field :description, type: String
+  field :items,       type: Array   # used by stripe
 
 
 
   ## Prawn/pdf unit of measure is 1/72"
   ## Canvas width: 612, height: 792
-  def generate_monthly_invoice month_on
+  def generate_monthly_invoice
     tree_img_url      = "#{Rails.root.join('public')}/tree-1.jpg"
     wasya_co_logo_url = "#{Rails.root.join('public')}/259x66-WasyaCo-logo.png"
 
@@ -76,7 +80,7 @@ class Ish::Invoice
 
       pdf.bounding_box( [4.5*72, 8.25*72], width: 3.25*72, height: 0.75*72 ) do
         pdf.text "Notes:"
-        pdf.text "Support & various tasks, for the month of #{ month_on }."
+        pdf.text "Support & various tasks, for the month of #{ month_on.strftime('%B') }."
       end
 
       lineitems_with_header = [

data/lib/wco/price.rb

@@ -18,7 +18,7 @@ class Wco::Price
 
   field :price_id   # stripe
 
-  def to_s
+  def name
     "$#{ amount_cents.to_f/100 } / #{interval}"
   end
 

data/lib/wco/product.rb

@@ -7,23 +7,29 @@ class Wco::Product
 
   field :product_id # stripe
 
-  ## @TODO: remove, interval makes no sense on product! replace with Wco::Price . _vp_ 2023-09-07
-  # INTERVALS = [ nil, 'day', 'week', 'month', 'year' ]
-  # field :interval, type: String
-
-  ## @TODO: remove, interval makes no sense on product! replace with Wco::Price . _vp_ 2023-09-07
-  # field :price_id   # stripe
-
-  ## @TODO: remove, interval makes no sense on product! replace with Wco::Price . _vp_ 2023-09-07
-  # field :price_cents, type: Integer
-
   ## @TODO: remove, interval makes no sense on product! replace with Wco::Price . _vp_ 2023-09-07
   # has_many :subscriptions, class_name: '::Wco::Subscription', inverse_of: :subscription
 
   has_many :prices,        class_name: '::Wco::Price', inverse_of: :product
 
   def self.list
-    [ [nil,nil] ] + self.all.map { |i| [i.name, i.id] }
+    [ [nil,nil] ] + self.all.order_by({ name: :asc }).map { |i| [i.name, i.id] }
   end
 
 end
+
+
+
+
+
+
+
+
+
+  ## @TODO: remove, interval makes no sense on product! replace with Wco::Price . _vp_ 2023-09-07
+  # INTERVALS = [ nil, 'day', 'week', 'month', 'year' ]
+  # field :interval, type: String
+  ## @TODO: remove, interval makes no sense on product! replace with Wco::Price . _vp_ 2023-09-07
+  # field :price_id   # stripe
+  ## @TODO: remove, interval makes no sense on product! replace with Wco::Price . _vp_ 2023-09-07
+  # field :price_cents, type: Integer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.267
+  version: 0.0.33.269
 platform: ruby
 authors:
 - piousbox