| {{prodName}} |
- {{prodCategory}} |
{{prodStore}} |
- {{prodLocation}} |
delete
edit
diff --git a/client/AdminMgmt/ProductMgmt/prodMgmtTbl.js b/client/AdminMgmt/ProductMgmt/prodMgmtTbl.js
index 3a036d3..04c7cf0 100644
--- a/client/AdminMgmt/ProductMgmt/prodMgmtTbl.js
+++ b/client/AdminMgmt/ProductMgmt/prodMgmtTbl.js
@@ -40,8 +40,6 @@ Template.prodMgmtTbl.events({
Session.set("prodEditId", this._id);
let prodInfo = Products.findOne({ _id: this._id });
$("#prodName").val(prodInfo.prodName);
- $("#prodCategory").val(prodInfo.prodCategory);
- $("#prodLocation").val(prodInfo.prodLocation);
$("#prodStore").val(prodInfo.prodStore);
$('select').formSelect();
},
diff --git a/client/Dashboard/dashboard.js b/client/Dashboard/dashboard.js
index e3467a8..80add4b 100644
--- a/client/Dashboard/dashboard.js
+++ b/client/Dashboard/dashboard.js
@@ -1,6 +1,4 @@
-import { Categories } from "../../imports/api/category";
import { Lists } from "../../imports/api/lists";
-import { Locations } from "../../imports/api/location";
import { Products } from "../../imports/api/products";
import { Stores } from "../../imports/api/stores";
import { Menus } from '../../imports/api/menu.js';
@@ -75,12 +73,6 @@ Template.dashboard.events({
case "prodMgmtLink":
FlowRouter.go('/manageProduct');
break;
- case "catMgmtLink":
- FlowRouter.go('/manageCategory');
- break;
- case "locationMgmtLink":
- FlowRouter.go('/manageLocation');
- break;
case "myMenuLink":
FlowRouter.go('/mymenus');
break;
@@ -105,12 +97,6 @@ Template.dashboard.events({
case "storeInfoCard":
FlowRouter.go('/manageStore');
break;
- case "catInfoCard":
- FlowRouter.go('/manageCategory');
- break;
- case "locInfoCard":
- FlowRouter.go('/manageLocation');
- break;
case "prodInfoCard":
FlowRouter.go("/manageProduct");
break;
diff --git a/imports/api/category.js b/imports/api/category.js
deleted file mode 100644
index eb8883b..0000000
--- a/imports/api/category.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Mongo } from 'meteor/mongo';
-import { check } from 'meteor/check';
-
-export const Categories = new Mongo.Collection('categories');
-
-Categories.allow({
- insert: function(userId, doc){
- // if use id exists, allow insert
- return !!userId;
- },
-});
-
-Meteor.methods({
- 'add.category' (categoryName) {
- check(categoryName, String);
-
- if (!this.userId) {
- throw new Meteor.Error('You are not allowed to add categories. Make sure you are logged in with valid user credentials.');
- }
-
- return Categories.insert({
- categoryName: categoryName,
- categoryOwner: this.userId,
- });
- },
- 'edit.category' (categoryId, categoryName,) {
- check(categoryId, String);
- check(categoryName, String);
-
- if (!this.userId) {
- throw new Meteor.Error('You are not allowed to edit categories. Make sure you are logged in with valid user credentials.');
- }
-
- return Categories.update({ _id: categoryId }, {
- $set: {
- categoryName: categoryName,
- }
- });
- },
- 'delete.category' (categoryId) {
- check(categoryId, String);
-
- if (!this.userId) {
- throw new Meteor.Error('You are not allowed to delete categories. Make sure you are logged in with valid user credentials.');
- }
-
- return Categories.remove({ _id: categoryId });
- },
-});
\ No newline at end of file
diff --git a/imports/api/listItems.js b/imports/api/listItems.js
index 50805cc..3eac732 100644
--- a/imports/api/listItems.js
+++ b/imports/api/listItems.js
@@ -35,9 +35,7 @@ Meteor.methods({
listId: listId,
prodId: result,
addedBy: this.userId,
- itemCategory: "",
itemStore: "",
- itemLocation: "",
itemOrdered: false,
itemReceived: false,
dateAddedToList: new Date(),
@@ -50,9 +48,7 @@ Meteor.methods({
listId: listId,
prodId: prodInfo._id,
addedBy: this.userId,
- itemCategory: prodInfo.prodCategory,
itemStore: prodInfo.prodStore,
- itemLocation: prodInfo.prodLocation,
itemOrdered: false,
itemReceived: false,
dateAddedToList: new Date(),
diff --git a/imports/api/location.js b/imports/api/location.js
deleted file mode 100644
index 05b0925..0000000
--- a/imports/api/location.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Mongo } from 'meteor/mongo';
-import { check } from 'meteor/check';
-
-export const Locations = new Mongo.Collection('locations');
-
-Locations.allow({
- insert: function(userId, doc){
- // if use id exists, allow insert
- return !!userId;
- },
-});
-
-Meteor.methods({
- 'add.location' (name) {
- check(name, String);
-
- if (!this.userId) {
- throw new Meteor.Error('You are not allowed to add locations. Make sure you are logged in with valid user credentials.');
- }
-
- return Locations.insert({
- locationName: name,
- owner: this.userId,
- });
- },
- 'edit.location' (locationId, locationName) {
- check(locationId, String);
- check(locationName, String);
-
- if (!this.userId) {
- throw new Meteor.Error('You are not allowed to edit locations. Make sure you are logged in with valid user credentials.');
- }
-
- return Locations.update({ _id: locationId }, {
- $set: {
- locationName: locationName,
- }
- });
- },
- 'delete.location' (locationId) {
- check(locationId, String);
-
- if (!this.userId) {
- throw new Meteor.Error('You are not allowed to delete locations. Make sure you are logged in with valid user credentials.');
- }
-
- return Locations.remove({ _id: locationId });
- },
-});
\ No newline at end of file
diff --git a/imports/api/products.js b/imports/api/products.js
index 91775f9..4e81e00 100644
--- a/imports/api/products.js
+++ b/imports/api/products.js
@@ -12,11 +12,9 @@ Products.allow({
});
Meteor.methods({
- 'add.product' (prodName, prodCategory, prodStore, prodLocation) {
+ 'add.product' (prodName, prodStore) {
check(prodName, String);
- check(prodCategory, String);
check(prodStore, String);
- check(prodLocation, String);
if (!this.userId) {
throw new Meteor.Error('You are not allowed to add products. Make sure you are logged in with valid user credentials.');
@@ -25,17 +23,13 @@ Meteor.methods({
return Products.insert({
prodName: prodName,
prodOwner: this.userId,
- prodCategory: prodCategory,
prodStore: prodStore,
- prodLocation: prodLocation,
});
},
- 'edit.product' (prodId, prodName, prodCategory, prodStore, prodLocation) {
+ 'edit.product' (prodId, prodName, prodStore) {
check(prodId, String);
check(prodName, String);
- check(prodCategory, String);
check(prodStore, String);
- check(prodLocation, String);
if (!this.userId) {
throw new Meteor.Error('You are not allowed to edit products. Make sure you are logged in with valid user credentials.');
@@ -44,9 +38,7 @@ Meteor.methods({
return Products.update({ _id: prodId }, {
$set: {
prodName: prodName,
- prodCategory: prodCategory,
prodStore: prodStore,
- prodLocation: prodLocation,
}
});
},
diff --git a/lib/routes.js b/lib/routes.js
index 0c3c7fd..9c777f9 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -61,20 +61,6 @@ FlowRouter.route('/manageProduct', {
}
});
-FlowRouter.route('/manageCategory', {
- name: 'manageCategory',
- action() {
- BlazeLayout.render('MainLayout', { main: 'catMgmt' });
- }
-});
-
-FlowRouter.route('/manageLocation', {
- name: 'manageLocation',
- action() {
- BlazeLayout.render('MainLayout', { main: 'locMgmt' });
- }
-});
-
FlowRouter.route('/manageLists', {
name: 'manageLists',
action() {
diff --git a/server/publish.js b/server/publish.js
index 79bc9d6..ad7e3c7 100644
--- a/server/publish.js
+++ b/server/publish.js
@@ -2,8 +2,6 @@ import { SysConfig } from '../imports/api/systemConfig.js';
import { Stores } from '../imports/api/stores.js';
import { UserConfigOptions } from '../imports/api/userConfigOptions.js';
import { Products } from '../imports/api/products.js';
-import { Categories } from '../imports/api/category.js';
-import { Locations } from '../imports/api/location.js';
import { Lists } from '../imports/api/lists.js';
import { ListItems } from '../imports/api/listItems.js';
import { Menus } from '../imports/api/menu.js';
@@ -39,22 +37,6 @@ Meteor.publish("myProducts", function() {
}
});
-Meteor.publish("myCategories", function() {
- try {
- return Categories.find({});
- } catch (error) {
- console.log(" ERROR pulling category data: " + error);
- }
-});
-
-Meteor.publish("myLocations", function() {
- try {
- return Locations.find({});
- } catch (error) {
- console.log(" ERROR pulling location data: " + error);
- }
-});
-
Meteor.publish("myLists", function() {
try {
return Lists.find( { $or: [ { listOwner: this.userId, listComplete: false }, { listShared: true, listComplete: false } ] } );
|