Permalink
Browse files

Merge branch 'master' into 19804

  • Loading branch information...
2 parents 2c2f1e2 + 63cfae3 commit cbe47a1d9332f2ca92dd696ec7c8c3538ad811b6 @lynnaloo lynnaloo committed Apr 5, 2013
Showing with 1,109 additions and 4,252 deletions.
  1. +1 −0 .gitignore
  2. 0 enyo-client/application/debug.html
  3. 0 enyo-client/application/index.html
  4. +5 −0 enyo-client/application/source/en/strings.js
  5. 0 enyo-client/application/source/ext/datasource.js
  6. +12 −0 enyo-client/application/source/models/customer.js
  7. +16 −0 enyo-client/application/source/models/static.js
  8. 0 enyo-client/application/source/package.js
  9. 0 enyo-client/application/source/preliminaries.js
  10. +29 −0 enyo-client/application/source/views/list.js
  11. +26 −0 enyo-client/application/source/views/workspace.js
  12. +1 −0 enyo-client/application/source/widgets/parameter.js
  13. +11 −0 enyo-client/application/source/widgets/picker.js
  14. 0 enyo-client/database/orm/models/account.json
  15. 0 enyo-client/database/orm/models/address.json
  16. 0 enyo-client/database/orm/models/characteristic.json
  17. 0 enyo-client/database/orm/models/comment.json
  18. 0 enyo-client/database/orm/models/contact.json
  19. +0 −9 enyo-client/database/orm/models/customer.json
  20. 0 enyo-client/database/orm/models/employee.json
  21. 0 enyo-client/database/orm/models/incident.json
  22. 0 enyo-client/database/orm/models/item.json
  23. 0 enyo-client/database/orm/models/opportunity.json
  24. 0 enyo-client/database/orm/models/project.json
  25. 0 enyo-client/database/orm/models/prospect.json
  26. 0 enyo-client/database/orm/models/to_do.json
  27. 0 enyo-client/database/orm/models/user_account.json
  28. 0 enyo-client/database/source/public/functions/geteffectivextuser.sql
  29. 0 enyo-client/extensions/.gitmodules
  30. 0 enyo-client/extensions/source/admin/client/models/models.js
  31. 0 enyo-client/extensions/source/incident_plus/database/orm/models/project.json
  32. +6 −0 enyo-client/extensions/source/sales/client/en/strings.js
  33. +8 −1 enyo-client/extensions/source/sales/client/postbooks.js
  34. +188 −0 enyo-client/extensions/source/sales/client/views/list.js
  35. +1 −0 enyo-client/extensions/source/sales/client/views/package.js
  36. +165 −1 enyo-client/extensions/source/sales/client/views/workspace.js
  37. +1 −0 enyo-client/extensions/source/sales/client/widgets/package.js
  38. +120 −0 enyo-client/extensions/source/sales/client/widgets/parameter.js
  39. 0 enyo-client/extensions/source/sales/database/orm/ext/account.json
  40. 0 enyo-client/extensions/source/sales/database/orm/ext/contact.json
  41. 0 enyo-client/extensions/source/sales/database/orm/ext/incident.json
  42. 0 enyo-client/extensions/source/sales/database/orm/ext/item.json
  43. 0 enyo-client/extensions/source/sales/database/orm/ext/item_site.json
  44. 0 enyo-client/extensions/source/sales/database/orm/ext/opportunity.json
  45. 0 enyo-client/extensions/source/sales/database/orm/ext/project.json
  46. 0 enyo-client/extensions/source/sales/database/orm/ext/to_do.json
  47. +4 −24 lib/backbone-x/package.json
  48. +0 −1 lib/backbone-x/source/model.js
  49. +0 −5 lib/backbone-x/source/model_mixin.js
  50. 0 lib/backbone-x/source/package.js
  51. 0 lib/backbone-x/source/simple_model.js
  52. +0 −18 lib/orm/package.json
  53. 0 lib/orm/source/xt/functions/add_column.sql
  54. 0 lib/orm/source/xt/functions/commit_record.sql
  55. 0 lib/orm/source/xt/functions/dispatch.sql
  56. 0 lib/orm/source/xt/functions/fetch.sql
  57. 0 lib/orm/source/xt/functions/retrieve_record.sql
  58. 0 lib/tools/source/session.js
  59. +1 −1 node-datasource/.gitignore
  60. 0 node-datasource/database/orm/models/oauth2.json
  61. +0 −115 node-datasource/database/orm/models/session.json
  62. +17 −4 node-datasource/database/source/init_global.sql
  63. 0 node-datasource/database/source/xt/tables/oa2client.sql
  64. 0 node-datasource/database/source/xt/tables/oa2clientredirs.sql
  65. 0 node-datasource/database/source/xt/tables/oa2token.sql
  66. +1 −11 node-datasource/database/source/xt/tables/session.sql
  67. +1 −7 node-datasource/database/source/xt/tables/sessionorg.sql
  68. 0 node-datasource/database/source/xt/tables/sessionstore.sql
  69. +28 −3 node-datasource/installer/installer.js
  70. +30 −10 node-datasource/installer/orm.js
  71. +0 −96 node-datasource/lib/ext/administrative_route.js
  72. +43 −35 node-datasource/lib/ext/database.js
  73. +139 −0 node-datasource/lib/ext/datasource.js
  74. +8 −12 node-datasource/lib/ext/models.js
  75. +51 −0 node-datasource/lib/ext/pgworker.js
  76. +0 −75 node-datasource/lib/ext/router.js
  77. +0 −413 node-datasource/lib/ext/session.js
  78. +0 −129 node-datasource/lib/functors/changePassword.js
  79. +0 −45 node-datasource/lib/functors/commit.js
  80. +0 −30 node-datasource/lib/functors/dispatch.js
  81. +0 −48 node-datasource/lib/functors/email.js
  82. +0 −47 node-datasource/lib/functors/extensions.js
  83. +0 −35 node-datasource/lib/functors/fetch.js
  84. +0 −30 node-datasource/lib/functors/logout.js
  85. +0 −100 node-datasource/lib/functors/resetPassword.js
  86. +0 −33 node-datasource/lib/functors/retrieve.js
  87. +0 −57 node-datasource/lib/functors/session.js
  88. +0 −69 node-datasource/lib/functors/syncUser.js
  89. +0 −1 node-datasource/lib/key.txt
  90. +14 −9 node-datasource/lib/options.js
  91. +0 −2 node-datasource/lib/private/.gitignore
  92. +0 −1 node-datasource/lib/private/salt.txt
  93. +0 −52 node-datasource/lib/register_service.js
  94. +0 −32 node-datasource/lib/routers/data.js
  95. +0 −12 node-datasource/lib/routers/lookup_router.js
  96. +0 −140 node-datasource/lib/routes/auth.js
  97. +0 −40 node-datasource/lib/routes/data.js
  98. +0 −71 node-datasource/lib/routes/dataFromKey.js
  99. +0 −17 node-datasource/lib/routes/database.js
  100. +0 −93 node-datasource/lib/routes/datasource.js
  101. +0 −225 node-datasource/lib/routes/export.js
  102. +0 −138 node-datasource/lib/routes/file.js
  103. +0 −309 node-datasource/lib/routes/maintenance.js
  104. +0 −113 node-datasource/lib/routes/oauth2auth.js
  105. +0 −57 node-datasource/lib/routes/oauth2token.js
  106. +0 −17 node-datasource/lib/routes/organization.js
  107. +0 −18 node-datasource/lib/routes/redirector.js
  108. +0 −146 node-datasource/lib/routes/report.js
  109. +0 −118 node-datasource/lib/routes/selection.js
  110. +0 −54 node-datasource/lib/routes/session.js
  111. +0 −174 node-datasource/lib/servers/dataserver.js
  112. +0 −7 node-datasource/lib/servers/find_servers.js
  113. +0 −3 node-datasource/lib/servers/package.json
  114. +0 −21 node-datasource/lib/servers/redirector.js
  115. +0 −27 node-datasource/lib/servers/smtpTransport.js
  116. +0 −23 node-datasource/lib/servers/unexposed.js
  117. +0 −12 node-datasource/lib/xt/runtime/devui.js
  118. +0 −30 node-datasource/lib/xt/server/functors/dispatch.js
  119. +15 −23 node-datasource/main.js
  120. 0 node-datasource/oauth2/db/accesstokens.js
  121. 0 node-datasource/oauth2/db/authorizationcodes.js
  122. 0 node-datasource/oauth2/db/clients.js
  123. +1 −1 node-datasource/oauth2/db/connect-xt-pg.js
  124. 0 node-datasource/oauth2/db/index.js
  125. 0 node-datasource/oauth2/db/users.js
  126. +5 −4 node-datasource/oauth2/oauth2.js
  127. +3 −2 node-datasource/oauth2/passport.js
  128. 0 node-datasource/oauth2/user.js
  129. 0 node-datasource/oauth2/utils.js
  130. 0 node-datasource/routes/auth.js
  131. 0 node-datasource/routes/data.js
  132. 0 node-datasource/routes/email.js
  133. +10 −7 node-datasource/routes/extensions.js
  134. 0 node-datasource/routes/file.js
  135. +12 −12 node-datasource/routes/maintenance.js
  136. 0 node-datasource/routes/redirector.js
  137. 0 node-datasource/routes/resetPassword.js
  138. +2 −3 node-datasource/routes/syncUser.js
  139. 0 node-datasource/runMaintenance.js
  140. +4 −11 node-datasource/sample_config.js
  141. +27 −0 node-datasource/test/vows/models/customer_group.js
  142. +27 −0 node-datasource/test/vows/models/freight_class.js
  143. +27 −0 node-datasource/test/vows/models/sales_rep.js
  144. +27 −0 node-datasource/test/vows/models/terms.js
  145. 0 node-datasource/views/account.ejs
  146. 0 node-datasource/views/dialog.ejs
  147. 0 node-datasource/views/layout.ejs
  148. 0 node-datasource/views/login.ejs
  149. BIN node-datasource/views/login/assets/favicon.ico
  150. BIN node-datasource/views/login/assets/logo.png
  151. BIN node-datasource/views/login/assets/you-shall-not-pass.png
  152. 0 node-datasource/views/login/stylesheets/ie.css
  153. 0 node-datasource/views/login/stylesheets/print.css
  154. 0 node-datasource/views/login/stylesheets/screen.css
  155. 0 node-datasource/views/scope.ejs
  156. +4 −43 node-datasource/xt/database/database.js
  157. +0 −2 node-datasource/xt/foundation/foundation.js
  158. +4 −27 node-datasource/xt/package.json
  159. +0 −55 node-datasource/xt/server/ext/functor.js
  160. +0 −201 node-datasource/xt/server/ext/response.js
  161. +0 −68 node-datasource/xt/server/ext/route.js
  162. +0 −147 node-datasource/xt/server/ext/router.js
  163. +0 −1 node-datasource/xt/server/package.json
  164. +0 −207 node-datasource/xt/server/server.js
  165. 0 node-datasource/xt/test/test.js
  166. +0 −1 node-datasource/xt/xt.js
  167. +8 −7 {node-datasource → }/package.json
  168. +6 −4 update.sh
View
@@ -1,4 +1,5 @@
*.DS_Store
*.swp
*.swo
+node_modules
npm-debug.log
View
No changes.
View
No changes.
@@ -140,13 +140,15 @@ var lang = XT.stringsFor("en_US", {
"_custPrice": "Cust. Price",
"_customer": "Customer",
"_customerType": "Customer Type",
+ "_customerTypes": "Customer Types",
"_customerPrice": "Customer Price",
"_customers": "Customers",
"_customerProspect": "Customer / Prospect",
"_dashboard": "Dashboard",
"_data": "Data",
"_dataState": "Data State",
"_date": "Date",
+ "_days": "Days",
"_deactivate": "Deactivate",
"_default": "Default",
"_defaults": "Defaults",
@@ -378,6 +380,7 @@ var lang = XT.stringsFor("en_US", {
"_propername": "Propername",
"_prospect": "Prospect",
"_prospects": "Prospects",
+ "_proximo": "Proximo",
"_public": "Public",
"_purchaseOrderNumber": "Purchase Order",
"_required": "Required",
@@ -400,6 +403,7 @@ var lang = XT.stringsFor("en_US", {
"_roles": "Roles",
"_salesRep": "Sales Rep",
"_saleType": "Sale Type",
+ "_saleTypes": "Sale Types",
"_schedule": "Schedule",
"_scheduleDate": "Schedule Date",
"_secondaryContact": "Secondary Contact",
@@ -416,6 +420,7 @@ var lang = XT.stringsFor("en_US", {
"_shipVia": "Ship Via",
"_shipTo": "Ship To",
"_shipZone": "Ship Zone",
+ "_shipZones": "Ship Zones",
"_shippingNotes": "Shipping Notes",
"_site": "Site",
"_siteCode": "Site Code",
View
No changes.
@@ -727,6 +727,18 @@ white:true*/
model: XM.ShipZone
});
+
+ /**
+ @class
+
+ @extends XM.Collection
+ */
+ XM.CustomerGroupCollection = XM.Collection.extend({
+ /** @scope XM.CustomerGroupCollection.prototype */
+
+ model: XM.CustomerGroup
+
+ });
/**
@class
@@ -145,4 +145,20 @@ white:true*/
XM.characteristicTypes.add(characteristicType);
}
+ // Terms Type
+ var termsTypeJson = [
+ { id: "D", name: "_days".loc() },
+ { id: "P", name: "_proximo".loc() }
+ ];
+ XM.TermsTypeModel = Backbone.Model.extend({
+ });
+ XM.TermsTypeCollection = Backbone.Collection.extend({
+ model: XM.TermsTypeModel
+ });
+ XM.termsTypes = new XM.TermsTypeCollection();
+ for (i = 0; i < termsTypeJson.length; i++) {
+ var termsType = new XM.TermsTypeModel(termsTypeJson[i]);
+ XM.termsTypes.add(termsType);
+ }
+
}());
View
No changes.
View
No changes.
@@ -382,6 +382,35 @@ trailing:true white:true*/
]
});
XV.registerModelList("XM.CustomerShiptoRelation", "XV.CustomerShiptoList");
+
+ // ..........................................................
+ // CUSTOMER TYPE LIST
+ //
+
+ enyo.kind({
+ name: "XV.CustomerTypeList",
+ kind: "XV.List",
+ label: "_customerTypes".loc(),
+ collection: "XM.CustomerTypeCollection",
+ query: {orderBy: [
+ {attribute: 'code'}
+ ]},
+ components: [
+ {kind: "XV.ListItem", components: [
+ {kind: "FittableColumns", components: [
+ {kind: "XV.ListColumn", classes: "short",
+ components: [
+ {kind: "XV.ListAttr", attr: "code", isKey: true}
+ ]},
+ {kind: "XV.ListColumn", classes: "last", fit: true, components: [
+ {kind: "XV.ListAttr", attr: "description"}
+ ]}
+ ]}
+ ]}
+ ]
+ });
+
+ XV.registerModelList("XM.CustomerType", "XV.CustomerTypeList");
// ..........................................................
// EMPLOYEE
@@ -569,6 +569,32 @@ trailing:true white:true*/
XV.registerModelWorkspace("XM.CustomerRelation", "XV.CustomerWorkspace");
XV.registerModelWorkspace("XM.CustomerListItem", "XV.CustomerWorkspace");
XV.registerModelWorkspace("XM.CustomerProspectListItem", "XV.CustomerWorkspace");
+
+ // ..........................................................
+ // CUSTOMER TYPE
+ //
+
+ enyo.kind({
+ name: "XV.CustomerTypeWorkspace",
+ kind: "XV.Workspace",
+ title: "_customerType".loc(),
+ model: "XM.CustomerType",
+ components: [
+ {kind: "Panels", arrangerKind: "CarouselArranger",
+ fit: true, components: [
+ {kind: "XV.Groupbox", name: "mainPanel", components: [
+ {kind: "onyx.GroupboxHeader", content: "_overview".loc()},
+ {kind: "XV.ScrollableGroupbox", name: "mainGroup",
+ classes: "in-panel", components: [
+ {kind: "XV.InputWidget", attr: "code"},
+ {kind: "XV.InputWidget", attr: "description"}
+ ]}
+ ]}
+ ]}
+ ]
+ });
+
+ XV.registerModelWorkspace("XM.CustomerType", "XV.CustomerTypeWorkspace");
// ..........................................................
// FILE
@@ -193,6 +193,7 @@ trailing:true white:true*/
{name: "name", label: "_name".loc(), attr: "name"}
]
});
+
// ..........................................................
// FILE
//
@@ -415,6 +415,17 @@ regexp:true, undef:true, trailing:true, white:true */
{attribute: 'code'}
]
});
+
+ // ..........................................................
+ // TERMS TYPE
+ //
+
+ enyo.kind({
+ name: "XV.TermsTypePicker",
+ kind: "XV.PickerWidget",
+ collection: "XM.termsTypes",
+ nameAttribute: "name"
+ });
// ..........................................................
// UNIT
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
@@ -1557,15 +1557,6 @@
"type": "Number",
"column": "custgrp_descrip"
}
- },
- {
- "name": "customers",
- "toMany": {
- "isNested": true,
- "type": "CustomerGroupCustomer",
- "column": "custgrp_id",
- "inverse": "customerGroup"
- }
}
],
"isSystem": true
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
No changes.
View
No changes.
No changes.
@@ -22,15 +22,20 @@ var lang = XT.stringsFor("en_US", {
"_autoAllocateCreditMemos": "Allocate Credit Memos to New Sales Order on Save",
"_autoSelectForBilling": "Check 'Select for Billing' option on Ship Order",
"_customerDefaults": "Customer Defaults",
+ "_customerTypes": "Customer Types",
"_creditControl": "Credit Control",
"_creditMemo": "Credit Memo",
"_current": "Current",
"_currentDate": "Current Date",
+ "_customerGroup": "Customer Groups",
+ "_cutOffDay": "Cutoff Day",
"_dateControl": "Date Control",
"_disableSalesOrderPriceOverride": "Disallow Override of Sale Price on Sales Order",
+ "_discountDays": "Discount Days",
"_doNotUpdate": "Do Not Update",
"_enableSOShipping": "Enable Shipping Interface from Sales Order screen",
"_firmSalesOrdersWhenAddedToPackingList": "Firm Sales Orders when added to Packing List Batch",
+ "_freightClass": "Freight Class",
"_freightPricing": "Freight Pricing",
"_hideSOMiscCharge": "Hide Misc. Charge on Sales Order screen",
"_ignoreIfDiscounted": "Ignore if Discounted",
@@ -55,6 +60,7 @@ var lang = XT.stringsFor("en_US", {
"_shipDate": "Ship Date",
"_showQuotesAfterConverted": "Show Quotes after Conversion to SO",
"_showSaveAndAddbutton": "Show 'Save and Add to Packing List' Button on Sales Order",
+ "_termsType": "Terms Type",
"_update": "Update",
"_useCalculatedFreightPricing": "Use calculated Freight values by default",
"_usePromiseDates": "Enable Promise Dates"
@@ -19,9 +19,16 @@ trailing:true white:true*/
panels = [
{name: "siteList", kind: "XV.SiteList"},
{name: "siteTypeList", kind: "XV.SiteTypeList"},
+ {name: "saleTypeList", kind: "XV.SaleTypeList"},
+ {name: "shipZoneList", kind: "XV.ShipZoneList"},
+ {name: "salesRepList", kind: "XV.SalesRepList"},
+ {name: "termsList", kind: "XV.TermsList"},
+ {name: "customerGroupList", kind: "XV.CustomerGroupList"},
+ {name: "freightClassList", kind: "XV.FreightClassList"},
{name: "itemSiteList", kind: "XV.ItemSiteList"},
{name: "costCategoryList", kind: "XV.CostCategoryList"},
- {name: "plannerCodeList", kind: "XV.PlannerCodeList"}
+ {name: "plannerCodeList", kind: "XV.PlannerCodeList"},
+ {name: "customerTypeList", kind: "XV.CustomerTypeList"}
];
XT.app.$.postbooks.appendPanels("setup", panels);
Oops, something went wrong.

0 comments on commit cbe47a1

Please sign in to comment.