Added New Entities (referencing from TS)

javascript/address.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, fromJson, getOne, fromJsonList,
     Request } from './model.js'
 import { isUndefinedOrNull } from './helpers.js';

javascript/assignment.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, fromJson, create, serialise, enumerateFiles, getList,
     patchOne, fromJsonList, getOne } from './model.js';
 import { notificationTypes, notificationRecieverIsCurrentUserFilter,

javascript/automatic_payment_relationship.js

@@ -1,5 +1,5 @@
 import { Company } from './company.js';
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import {
     addPropertyTo, serialise, fromJson, create, enumerateFiles,
     deleteOne, getList, fromJsonList, getOne } from './model.js';

javascript/bank.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo } from './model.js';
 import { Address } from './address.js';
 import { Companies } from './company.js';

javascript/cart.js

@@ -1,6 +1,6 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, serialise, enumerateFiles, getOne, fromJson, patchOne,
-   create } from './model.js';
+   create, Request } from './model.js';
 import { Address } from './address.js';
 import { CartItem } from './cart_item.js';
 import { CartShipmentGroup } from './cart_shipment_group.js';

javascript/cart_item.js

@@ -1,6 +1,8 @@
-import { generateUUID } from './uuid.js';
-import { addPropertyTo, serialise, fromJson, create,
-     enumerateFiles } from './model.js';
+import generateUUID from './uuid.js';
+import {
+    addPropertyTo, serialise, fromJson, create,
+    enumerateFiles, deleteOneV2, getOne,Request, patchOne
+} from './model.js';
 import { Cart } from './cart.js';
 import { CountryTax } from './country_tax.js';
 import { Product } from './product.js';
@@ -36,18 +38,58 @@ export function CartItem() {
         function handleResponse(result) {
             success(fromJson(self, result[self.json]));
         }
-        create({resource: this.resource,
-                parameters: data[0],
-                as_domain: asDomain,
-                files: enumerateFiles(data[1]),
-                success: handleResponse,
+        create({
+            resource: this.resource,
+            parameters: data[0],
+            as_domain: asDomain,
+            files: enumerateFiles(data[1]),
+            success: handleResponse,
+            error: error,
+            embed: embed
+        });
+    };
+
+    this.get = function (success, error, embed, includeArchived,
+        withRights) {
+        var self = this,
+            parameters = {
+                embed: embed,
                 error: error,
-                embed: embed});
+                id: this.id(),
+                includeArchived: includeArchived,
+                withRights: withRights,
+                resource: this.resource,
+                cartToken: this.cart().token()
+            };
+        function handleResponse(result) {
+            success(fromJson(self, result[self.json],
+                { makesDirty: false }));
+        }
+        parameters.success = handleResponse;
+        getOne(parameters);
+    };
+
+
+    this.patch = function (success, error, embed) {
+        var self = this,
+            data = serialise(this, undefined, undefined, undefined,
+                             {excludeOld: true})[0];
+        function handleResponse(result) {
+            success(fromJson(self, result[self.json],
+                             {makesDirty: false}));
+        }
+        patchOne({cartToken: this.cart().token(),
+                  resource: this.resource,
+                  id: this.id(),
+                  success: handleResponse,
+                  error: error,
+                  data: data,
+                  embed: embed});
     };
 
     this.calculate = function (success, error, embed) {
-        var request = new Request(),
-            data = serialise(this)[0];
+        var request = new Request();
+        var data = serialise(this)[0];
         request.resource('/cart-item-cost-estimate/');
         request.method('POST');
         request.query().add('skip_rights', true);
@@ -63,9 +105,18 @@ export function CartItem() {
         request.send();
     };
 
-    this.requiresShipment = function() {
+    this.destroy = function (success, error) {
+        deleteOneV2({
+            resource: this.resource + "/" + this.id(),
+            success: success,
+            error: error,
+            cartToken: this.cart().token()
+        });
+    };
+
+    this.requiresShipment = function () {
         var product = this.product();
+        //console.log("bhbh")
         return product ? product.needsShipping() : false;
     };
-
 }

javascript/cart_shipment_group.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo } from './model.js';
 import { CartItem } from './cart_item.js';
 import { CartShipmentQuote } from './cart_shipment_quote.js';

javascript/cart_shipment_quote.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo } from './model.js';
 import { ShipmentMethod } from './shipment_method.js';
 

javascript/category.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, fromJson, serialise, create, enumerateFiles,
     getOne, deleteOne, fromJsonList, getList } from './model.js';
 import { Domain } from './domain.js';

javascript/company_invitation.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, serialise, fromJson, create, enumerateFiles,
     deleteOne, getList, fromJsonList, getOne } from './model.js';
 

javascript/component.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, fromJson, getOne, serialise, enumerateFiles, patchOne,
     fromJsonList, getList, create } from './model.js';
 import { MerchiFile } from './merchi_file.js';

javascript/component_tag.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, fromJson, getOne, serialise, create, enumerateFiles,
     fromJsonList, getList } from './model.js';
 

javascript/discount.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo } from './model.js';
 
 export function Discount() {

javascript/discount_group.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo } from './model.js';
 
 

javascript/domain.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { Dictionary } from './dictionary.js';
 import { addPropertyTo, serialise, fromJson, getList, fromJsonList, patchOne,
     getOne, create, enumerateFiles, Request } from './model.js';

javascript/domain_invitation.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo } from './model.js';
 
 export function DomainInvitation() {

javascript/domain_tag.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, serialise, create, fromJson, patchOne, deleteOne,
     fromJsonList, getList, enumerateFiles, getOne } from './model.js';
 import { Domain } from './domain.js';

javascript/email_address.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, getList, fromJsonList } from './model.js';
 
 export function EmailAddress() {

javascript/enrolled_domain.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, serialise, fromJson, create, enumerateFiles,
     getOne, patchOne, deleteOne, getList, fromJsonList } from './model.js';
 import { Domain } from './domain.js';

javascript/exchange_rate.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, serialise, fromJson, create, enumerateFiles, deleteOne,
     getOne, fromJsonList, getList } from './model.js';
 

javascript/inventory.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, serialise, fromJson, create, getOne, deleteOne,
     patchOne, fromJsonList, getList, enumerateFiles } from './model.js';
 import { Address } from './address.js';

javascript/invoice.js

@@ -1,5 +1,5 @@
-import moment from 'moment-timezone';
-import { generateUUID } from './uuid.js';
+import moment from 'moment';
+import generateUUID from './uuid.js';
 import { addPropertyTo, create, serialise, enumerateFiles, getOne, getList,
     fromJson, deleteOne, fromJsonList, patchOne, Request } from './model.js';
 import { isUndefinedOrNull } from './helpers.js';

javascript/item.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo } from './model.js';
 import { CountryTax } from './country_tax.js';
 

javascript/job.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { Dictionary } from './dictionary.js';
 import { addPropertyTo, getOne, create, serialise, recoverOne, deleteOne,
     fromJson, patchOne, getList, fromJsonList, enumerateFiles,

javascript/job_comment.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, enumerateFiles, fromJson, create,
     serialise } from './model.js';
 import { Job } from './job.js';

javascript/matching_inventory.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo } from './model.js';
 import { Inventory } from './inventory.js';
 import { Job } from './job.js';

javascript/menu.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo, fromJson, getOne, deleteOne } from './model.js';
 import { MenuItem } from './menu_item.js';
 

javascript/menu_item.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { addPropertyTo } from './model.js';
 
 export function MenuItem() {

javascript/merchi.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { isNull, isUndefined, isUndefinedOrNull, id,
     notEmptyArray, isArray, removeObjectFromArrayWithIntegerValue,
     sortArrayByObjectKey, getGlobal } from './helpers.js';
@@ -75,6 +75,7 @@ import { VariationFieldsOption } from './variation_fields_option.js';
 import { VariationsGroup } from './variations_group.js';
 import { QuoteItem, QuoteItems } from './quote_item.js';
 import { Quotes, Quote } from './quote.js';
+import { CartShipmentQuote } from './cart_shipment_quote.js';
 
 export function merchi(backendUri, websocketUri) {
     getGlobal().merchiJsonpHandlers = {};
@@ -944,6 +945,7 @@ export function merchi(backendUri, websocketUri) {
             'JobComment': JobComment,
             'Cart': Cart,
             'CartItem': CartItem,
+            'CartShipmentQuote': CartShipmentQuote,
             'Bank': Bank,
             'QuoteItem': QuoteItem,
             'QuoteItems': new QuoteItems(),

javascript/merchi_file.js

@@ -1,4 +1,4 @@
-import { generateUUID } from './uuid.js';
+import generateUUID from './uuid.js';
 import { Dictionary } from './dictionary.js';
 import { addPropertyTo, fromJson, getOne, serialise, create, enumerateFiles,
     getList, fromJsonList, deleteOne, Request } from './model.js';