Move models into autoloaded classes

api/brand-add.php

@@ -1,6 +1,5 @@
 <?
 include '../scat.php';
-include '../lib/catalog.php';
 
 $name= $_REQUEST['name'];
 $slug= $_REQUEST['slug'];

api/brand-list.php

@@ -1,6 +1,5 @@
 <?php
 require '../scat.php';
-require '../lib/catalog.php';
 
 $verbose= (int)$_REQUEST['verbose'];
 

api/brand-load.php

@@ -1,6 +1,5 @@
 <?php
 require '../scat.php';
-require '../lib/catalog.php';
 
 $id= (int)$_REQUEST['id'];
 

api/brand-merge.php

@@ -1,6 +1,5 @@
 <?
 include '../scat.php';
-include '../lib/catalog.php';
 
 $id= (int)$_REQUEST['id'];
 $dest= (int)$_REQUEST['dest'];

api/brand-update.php

@@ -1,6 +1,5 @@
 <?
 include '../scat.php';
-include '../lib/catalog.php';
 
 $id= (int)$_REQUEST['id'];
 $name= $_REQUEST['name'];

api/department-find.php

@@ -1,6 +1,5 @@
 <?php
 require '../scat.php';
-require '../lib/catalog.php';
 
 $parent= (int)$_REQUEST['parent'];
 

api/generate-slug.php

@@ -1,6 +1,5 @@
 <?php
 require '../scat.php';
-require '../lib/catalog.php';
 
 $brand_id= (int)$_REQUEST['brand'];
 $name= $db->escape($_REQUEST['name']);

api/note-add.php

@@ -1,6 +1,5 @@
 <?
 include '../scat.php';
-include '../lib/catalog.php';
 
 $content= $_REQUEST['content'];
 $kind= $_REQUEST['kind'];

api/note-count.php

@@ -1,6 +1,5 @@
 <?php
 require '../scat.php';
-require '../lib/catalog.php';
 
 $attach_id= (int)$_REQUEST['attach_id'];
 if ($attach_id) {

api/note-find.php

@@ -1,6 +1,5 @@
 <?php
 require '../scat.php';
-require '../lib/catalog.php';
 
 $limit= (int)$_REQUEST['limit'];
 if (!$limit) $limit= 100;

api/note-update.php

@@ -1,6 +1,5 @@
-<?
+<?php
 include '../scat.php';
-include '../lib/catalog.php';
 
 $id= (int)$_REQUEST['id'];
 $content= $_REQUEST['content'];

api/product-add.php

@@ -1,6 +1,5 @@
 <?
 include '../scat.php';
-include '../lib/catalog.php';
 
 $name= $_REQUEST['name'];
 $slug= $_REQUEST['slug'];

api/product-find.php

@@ -1,6 +1,5 @@
 <?
 include '../scat.php';
-include '../lib/catalog.php';
 
 $term= $_REQUEST['term'];
 

api/product-update.php

@@ -1,6 +1,5 @@
 <?
 include '../scat.php';
-include '../lib/catalog.php';
 
 $id= (int)$_REQUEST['id'];
 $name= $_REQUEST['name'];

api/till-count.php

@@ -1,7 +1,5 @@
 <?php
 require '../scat.php';
-require '../lib/txn.php';
-require '../lib/catalog.php';
 
 $count= $_REQUEST['count'];
 if (empty($count))

api/till-withdraw.php

@@ -1,7 +1,6 @@
 <?php
 require '../scat.php';
 require '../lib/txn.php';
-require '../lib/catalog.php';
 
 $reason= $_REQUEST['reason'];
 if (!$reason)

catalog-brands.php

@@ -1,6 +1,5 @@
 <?
 require 'scat.php';
-require 'lib/catalog.php';
 
 head("Brands @ Scat", true);
 

catalog-department.php

@@ -1,6 +1,5 @@
 <?
 require 'scat.php';
-require 'lib/catalog.php';
 
 // XXX Use Knockout to make title dynamic
 head("Department @ Scat", true);

catalog-departments.php

@@ -1,6 +1,5 @@
 <?
 require 'scat.php';
-require 'lib/catalog.php';
 
 $id= (int)$_REQUEST['id'];
 

catalog-product.php

@@ -1,6 +1,5 @@
 <?
 require 'scat.php';
-require 'lib/catalog.php';
 
 // XXX Use Knockout to make title dynamic
 head("Product @ Scat", true);

catalog-search.php

@@ -1,6 +1,5 @@
 <?
 require 'scat.php';
-require 'lib/catalog.php';
 
 head("Search Catalog @ Scat", true);
 

composer.json

@@ -8,6 +8,11 @@
             "email": "jimw@trainedmonkey.com"
         }
     ],
+    "autoload": {
+        "psr-4": {
+          "Scat\\" : "lib/Scat/"
+        }
+    },
     "require": {
         "moment/moment": "^2.17",
         "components/jquery": "^3.1",

index.php

@@ -297,7 +297,7 @@ function setActiveRow(row) {
   fld.focus().select();
 });
 
-var paymentMethods= <?=json_encode(\Payment::$methods)?>;
+var paymentMethods= <?=json_encode(\Scat\Payment::$methods)?>;
 
 function formatMethod(payment) {
   if (payment.method() == 'discount' && payment.discount()) {

item.php

@@ -1,7 +1,6 @@
 <?
 require 'scat.php';
 require 'lib/item.php';
-require 'lib/catalog.php';
 
 $code= $_GET['code'];
 $id= (int)$_GET['id'];

lib/Scat/Brand.php

@@ -0,0 +1,9 @@
+<?php
+namespace Scat;
+
+class Brand extends \Model {
+  public function products() {
+    return $this->has_many('Product');
+  }
+}
+

lib/Scat/Department.php

@@ -0,0 +1,18 @@
+<?php
+namespace Scat;
+
+class Department extends \Model {
+  public function parent() {
+    return $this->belongs_to('Department', 'parent_id');
+  }
+
+  public function departments() {
+    return $this->has_many('Department', 'parent_id');
+  }
+
+  public function products() {
+    return $this->has_many('Product');
+  }
+}
+
+

lib/giftcard.php → lib/Scat/GiftCard.php

@@ -1,8 +1,9 @@
 <?php
+namespace Scat;
 
-include '../lib/php-barcode.php';
+include dirname(__FILE__).'/../php-barcode.php';
 
-class Giftcard extends Model implements JsonSerializable {
+class Giftcard extends \Model implements \JsonSerializable {
   public function card() {
     return $self->id . $self->pin;
   }
@@ -120,7 +121,7 @@ public function getPDF() {
   }
 }
 
-class Giftcard_Txn extends Model {
+class Giftcard_Txn extends \Model {
   public function card() {
     return $this->belongs_to('Giftcard', 'card_id');
   }

lib/Scat/Item.php

@@ -0,0 +1,24 @@
+<?
+namespace Scat;
+
+class Item extends \Model {
+  /* XXX Legacy, should get from parent product */
+  public function brand() {
+    return $this->belongs_to('Brand', 'brand');
+  }
+
+  public function product() {
+    return $this->belongs_to('Product');
+  }
+
+  public function barcodes() {
+    return $this->has_many('Barcode', 'item');
+  }
+}
+
+class Barcode extends \Model {
+  public function item() {
+    return $this->belongs_to('Item', 'item');
+  }
+}
+

lib/Scat/Note.php

@@ -0,0 +1,12 @@
+<?php
+namespace Scat;
+
+class Note extends \Model {
+  public function person() {
+    return $this->belongs_to('Person');
+  }
+
+  public function parent() {
+    return $this->belongs_to('Note', 'parent_id');
+  }
+}

lib/Scat/Payment.php

@@ -0,0 +1,21 @@
+<?php
+namespace Scat;
+
+class Payment extends \Model {
+  public static $methods= array(
+    'cash' => "Cash",
+    'change' => "Change",
+    'credit' => "Credit Card",
+    'square' => "Square",
+    'stripe' => "Stripe",
+    'gift' => "Gift Card",
+    'check' => "Check",
+    'dwolla' => "Dwolla",
+    'paypal' => "PayPal",
+    'discount' => "Discount",
+    'bad' => "Bad Debt",
+    'donation' => "Donation",
+    'withdrawal' => "Withdrawal",
+    'internal' => "Internal",
+  );
+}

lib/Scat/Product.php

@@ -0,0 +1,25 @@
+<?php
+namespace Scat;
+
+class Product extends \Model implements \JsonSerializable {
+  public function brand() {
+    return $this->belongs_to('Brand');
+  }
+
+  public function items() {
+    return $this->has_many('Item')
+                ->select('item.*')
+                ->select_expr('sale_price(item.retail_price,
+                                          item.discount_type,
+                                          item.discount)',
+                              'sale_price')
+                ->select_expr('(SELECT IFNULL(SUM(allocated),0)
+                                  FROM txn_line
+                                 WHERE txn_line.item = item.id)',
+                              'stock');
+  }
+
+  public function jsonSerialize() {
+    return $this->asArray();
+  }
+}

lib/Scat/Txn.php

@@ -0,0 +1,13 @@
+<?php
+namespace Scat;
+
+/* XXX add relationships, but just using these raw for now */
+
+class Txn extends \Model {
+}
+
+class TxnLine extends \Model {
+}
+
+class PriceOverride extends \Model {
+}