ou -> category, closes #59

seiyria · Jan 4, 2017 · bb58d6e · bb58d6e
1 parent 715458e
commit bb58d6e
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/src/client/pages/inventory/inventory.html b/src/client/pages/inventory/inventory.html
@@ -53,7 +53,7 @@
             <ion-grid no-padding>
               <ion-row column-headers>
                 <ion-col width-33 no-padding>Product</ion-col>
-                <ion-col width-20 no-padding>OU</ion-col>
+                <ion-col width-20 no-padding>Category</ion-col>
                 <ion-col width-10 no-padding>SKU</ion-col>
                 <ion-col width-10 no-padding text-right>Quantity</ion-col>
                 <ion-col width-10 no-padding text-right>Consumer Cost</ion-col>

diff --git a/src/client/pages/inventory/ivmanage/ivmanage.ts b/src/client/pages/inventory/ivmanage/ivmanage.ts
@@ -26,7 +26,7 @@ export class InventoryMassManagementComponent implements OnInit {
       format: (x) => x },
     { name: 'Description',  column: 'description',              alias: 'Description',   shouldUse: false,
       format: (x) => x },
-    { name: 'OU Name',      column: 'organizationalunit.name',  alias: 'OU',            shouldUse: true,
+    { name: 'Category',     column: 'organizationalunit.name',  alias: 'Category',      shouldUse: true,
       format: (x) => x },
     { name: 'Taxable',      column: 'taxable',                  alias: 'Taxable',       shouldUse: true,
       format: (x) => +x },

diff --git a/src/client/pages/inventory/management/inventory.management.html b/src/client/pages/inventory/management/inventory.management.html
@@ -44,7 +44,7 @@
           </ion-item>
 
           <ion-item form-item required>
-            <ion-label stacked>Organizational Unit</ion-label>
+            <ion-label stacked>Category</ion-label>
             <ion-select [(ngModel)]="stockItem.organizationalunitId">
               <ion-option *ngFor="let ou of allOU | async" value="{{ou.id}}">{{ou.name}}</ion-option>
             </ion-select>

diff --git a/src/client/pages/inventory/oumanage/ou.management.html b/src/client/pages/inventory/oumanage/ou.management.html
@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar>
     <ion-title>
-      Manage Organizational Units
+      Manage Categories
     </ion-title>
     <ion-buttons start>
       <button ion-button (click)="dismiss()">
@@ -17,11 +17,11 @@
       <ion-col width-67>
         <ion-list>
           <ion-item form-item *ngIf="!ou.id">
-            <ion-label stacked>New Organizational Unit Name</ion-label>
+            <ion-label stacked>New Category Name</ion-label>
             <ion-input type="text" [(ngModel)]="ou.name" maxlength="50" (keyup.enter)="addNewOU()"></ion-input>
           </ion-item>
           <ion-item form-item *ngIf="ou.id">
-            <ion-label stacked>Organizational Unit Name</ion-label>
+            <ion-label stacked>Category Name</ion-label>
             <ion-input type="text" [(ngModel)]="ou.name" maxlength="50" (keyup.enter)="updateOU(ou)"></ion-input>
           </ion-item>
           <ion-item small-item>
@@ -38,7 +38,7 @@
     <ion-row *ngIf="allOU.length === 0">
       <ion-col>
         <div full-height true-center text-center big-text background-text>
-          You don't have any Organizational Units. You'll need to create some to add inventory.
+          You don't have any Categories. You'll need to create some to add inventory.
         </div>
       </ion-col>
     </ion-row>

diff --git a/src/client/pages/inventory/oumanage/ou.management.ts b/src/client/pages/inventory/oumanage/ou.management.ts
@@ -43,8 +43,8 @@ export class OUManagerComponent implements OnInit {
   removeOU(ou: OrganizationalUnit) {
 
     const confirm = this.alertCtrl.create({
-      title: `Remove Organizational Unit "${ou.name}"?`,
-      message: 'Exercise caution when doing this. You may receive errors if you still have items assigned to this OU.',
+      title: `Remove Category "${ou.name}"?`,
+      message: 'Exercise caution when doing this. You may receive errors if you still have items assigned to this category.',
       buttons: [
         {
           text: 'Cancel'

diff --git a/src/client/pages/promotions/management/promotions.management.html b/src/client/pages/promotions/management/promotions.management.html
@@ -147,7 +147,7 @@
           <ion-row form-item radio-group [(ngModel)]="promotion.discountGrouping" (ionChange)="changeGrouping()">
             <ion-col no-padding>
               <ion-item>
-                <ion-label>By OU</ion-label>
+                <ion-label>By Category</ion-label>
                 <ion-radio value="OU"></ion-radio>
               </ion-item>
             </ion-col>
@@ -164,7 +164,7 @@
           </ion-item>
 
           <ion-item form-item required *ngIf="promotion.discountGrouping === 'OU'">
-            <ion-label stacked>Organizational Unit</ion-label>
+            <ion-label stacked>Category</ion-label>
             <ion-select [(ngModel)]="promotion.organizationalunitId">
               <ion-option *ngFor="let ou of allOU | async" value="{{ou.id}}">{{ou.name}}</ion-option>
             </ion-select>

diff --git a/src/client/pages/reporting/configurations.ts b/src/client/pages/reporting/configurations.ts
@@ -4,7 +4,7 @@ import { ReportConfiguration } from '../../models/reportconfiguration';
 const stockItemColumns = [
   { name: 'Name',             key: 'name' },
   { name: 'SKU',              key: 'sku' },
-  { name: 'OU',               key: 'organizationalunit.name', allowGroup: true },
+  { name: 'Category',         key: 'organizationalunit.name', allowGroup: true },
   { name: 'Taxable',          key: 'taxable' },
   { name: 'Cost',             key: 'cost', always: true },
   { name: 'Quantity',         key: 'quantity', always: true },

diff --git a/src/client/pages/reporting/reporting.html b/src/client/pages/reporting/reporting.html
@@ -115,7 +115,7 @@ <h1>{{ currentReport.name }} <span *ngIf="!currentReport.internalId">(custom)</s
 
           <ion-col width-20 *ngIf="currentReport.filters.ouFilter">
             <ion-item list-header shrunk-item-checkbox>
-              <ion-label stacked>OU Filter</ion-label>
+              <ion-label stacked>Category Filter</ion-label>
               <ion-select [(ngModel)]="currentReport.ouFilter" placeholder="Nothing">
                 <ion-option selected="true" value="">Nothing</ion-option>
                 <ion-option *ngFor="let ou of ous" [value]="ou.id">{{ ou.name }}</ion-option>

diff --git a/src/server/orm/stockitem.ts b/src/server/orm/stockitem.ts
@@ -23,7 +23,7 @@ export const StockItem = bookshelf.Model.extend({
       {
         method: 'isLength',
         args: { min: 1, max: 50 },
-        error: 'Your OU name must be between 1 and 50 characters.'
+        error: 'Your category name must be between 1 and 50 characters.'
       }
     ],
     sku: [