Adapt for new ordermodel (#97)

Co-authored-by: Niklas Fondberg <niklas.fondberg@photowall.se>
2022-01-20 07:11:43 +01:00
parent ea086568d0
commit e57cab3b23
22 changed files with 467 additions and 2842 deletions
@@ -47,37 +47,6 @@ describe('GraphQL Apollo tests', () => {
      expect(response.rows[0].value).toBe('sv_SE');
      expect(response.rows[0].name).toBe('Swedish (Sweden)');
    });
    it('should be connected to test db', async () => {
      // CONTROL
      const db_response = await allContainers.db.raw(
        `SELECT * FROM designers WHERE designerid=1;`,
      );
      const controlData = db_response.rows[0];
      // ----------------
      const port = allContainers.apiContainer.getMappedPort(4000);
      const response = await fetch(`http://localhost:${port}`, {
        method: 'POST',
        headers: { 'Content-Type': 'application/json' },
        body: JSON.stringify({
          query: `
      {
        designer(id: 1) {
          id
          name
          path
        }
      }`,
        }),
      });
      const resp = await response.json();
      const designer = resp.data.designer;
      expect(designer.id).toBe('1');
      expect(designer.name).toBe(controlData.name);
      expect(designer.path).toBe(controlData.path);
    });
  });
  describe('Designer(id: x)', () => {
@@ -87,20 +56,7 @@ describe('GraphQL Apollo tests', () => {
        `SELECT * FROM designers WHERE designerid=2;`,
      );
      const controlData = db_response.rows[0];
-      const db_order_response = await allContainers.db.raw(
+
        `SELECT
            rows.rowid,
            name.value AS name,
            designer_id.value AS designer_id,
            artno.value AS artno
          FROM "order-rows" ROWS
            JOIN orders ON rows.orderid = orders.id
            LEFT JOIN "order-rows_details" designer_id ON designer_id.rowid = rows.rowid AND designer_id.fieldid = 105
            LEFT JOIN "order-rows_details" artno ON artno.rowid = rows.rowid AND artno.fieldid = 95
            LEFT JOIN "order-rows_details" name ON name.rowid = rows.rowid AND name.fieldid = 97
          WHERE designer_id.value = '2';`,
      );
      const controlDataOrders = db_order_response.rows;
      // --------------
      const port = allContainers.apiContainer.getMappedPort(4000);
@@ -114,10 +70,6 @@ describe('GraphQL Apollo tests', () => {
          id
          name
          path
          orderRows(pagination: {limit: 1000}) {
            name
            artNo
          }
        }
      }`,
        }),
@@ -129,12 +81,6 @@ describe('GraphQL Apollo tests', () => {
      expect(designer.id).toBe('2');
      expect(designer.name).toBe(controlData.name);
      expect(designer.path).toBe(controlData.path);
      expect(designer.orderRows.length).toBe(controlDataOrders.length);
      expect(designer.orderRows[0].name).toBe(controlDataOrders[0].name);
      expect(designer.orderRows[designer.orderRows.length - 1].artNo).toBe(
        controlDataOrders[controlDataOrders.length - 1].artno,
      );
    });
    it('should be possible to fetch a designers with limit', async () => {
@@ -156,10 +102,6 @@ describe('GraphQL Apollo tests', () => {
          id
          name
          path
          orderRows(pagination: {limit: 1000}) {
            name,
            artNo
          }
        }
      }`,
        }),
@@ -168,121 +110,100 @@ describe('GraphQL Apollo tests', () => {
      const resp = await response.json();
      const designers = resp.data.designers;
      const designerWithRows = designers[0];
      const db_order_response = await allContainers.db.raw(
        `SELECT
            rows.rowid,
            name.value AS name,
            designer_id.value AS designer_id,
            artno.value AS artno
          FROM "order-rows" ROWS
            JOIN orders ON rows.orderid = orders.id
            LEFT JOIN "order-rows_details" designer_id ON designer_id.rowid = rows.rowid AND designer_id.fieldid = 105
            LEFT JOIN "order-rows_details" artno ON artno.rowid = rows.rowid AND artno.fieldid = 95
            LEFT JOIN "order-rows_details" name ON name.rowid = rows.rowid AND name.fieldid = 97
          WHERE designer_id.value = '${designerWithRows.id}';`,
      );
      const controlDataOrders = db_order_response.rows;
      expect(designers.length).toBe(3);
      expect(designers[0].name).toBe(controlData[0].name);
      expect(designers[1].name).toBe(controlData[1].name);
      expect(designers[2].name).toBe(controlData[2].name);
      expect(designerWithRows.orderRows.length).toBe(controlDataOrders.length);
      expect(designerWithRows.orderRows[0].name).toBe(
        controlDataOrders[0].name,
      );
    });
  });
-  describe('Order(id: x)', () => {
+  // describe('Order(id: x)', () => {
-    it('should get correct order data', async () => {
+  //   it('should get correct order data', async () => {
-      // CONTROL
+  //     // CONTROL
-      // Order
+  //     // Order
-      const order_response = await allContainers.db.raw(
+  //     const order_response = await allContainers.db.raw(
-        `SELECT * FROM orders WHERE id = 1;`,
+  //       `SELECT * FROM orders WHERE id = 1;`,
-      );
+  //     );
-      const orderControlData = order_response.rows[0];
+  //     const orderControlData = order_response.rows[0];
-      // Market
+  //     // Market
-      const market_response = await allContainers.db.raw(
+  //     const market_response = await allContainers.db.raw(
-        `SELECT * FROM markets WHERE name='${orderControlData.market}';`,
+  //       `SELECT * FROM markets WHERE name='${orderControlData.market}';`,
-      );
+  //     );
-      const marketControlData = market_response.rows[0];
+  //     const marketControlData = market_response.rows[0];
-      // Locale
+  //     // Locale
-      const locale_response = await allContainers.db.raw(
+  //     const locale_response = await allContainers.db.raw(
-        `SELECT * FROM locales WHERE value='${orderControlData.locale}';`,
+  //       `SELECT * FROM locales WHERE value='${orderControlData.locale}';`,
-      );
+  //     );
-      const localeControlData = locale_response.rows[0];
+  //     const localeControlData = locale_response.rows[0];
-      // Order row
+  //     // Order row
-      const orderrow_response = await allContainers.db.raw(
+  //     const orderrow_response = await allContainers.db.raw(
-        `SELECT * FROM "order-rows" WHERE orderid = 1;`,
+  //       `SELECT * FROM "order-rows" WHERE orderid = 1;`,
-      );
+  //     );
-      const orderRowsControlData = orderrow_response.rows;
+  //     const orderRowsControlData = orderrow_response.rows;
-      // ----------------------------------
+  //     // ----------------------------------
-      const port = allContainers.apiContainer.getMappedPort(4000);
+  //     const port = allContainers.apiContainer.getMappedPort(4000);
-      const response = await fetch(`http://localhost:${port}`, {
+  //     const response = await fetch(`http://localhost:${port}`, {
-        method: 'POST',
+  //       method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
+  //       headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
+  //       body: JSON.stringify({
-          query: `
+  //         query: `
-          {
+  //         {
-            order(id: 1) {
+  //           order(id: 1) {
-              id
+  //             id
-              locale {
+  //             locale {
-                id
+  //               id
-                value
+  //               value
-              }
+  //             }
-              market {
+  //             market {
-                id
+  //               id
-                name
+  //               name
-                vat
+  //               vat
-                currency
+  //               currency
-                priceAdjustment
+  //               priceAdjustment
-              }
+  //             }
-              rows {
+  //             rows {
-                id
+  //               id
-                artNo
+  //               artNo
-                orderId
+  //               orderId
-              }
+  //             }
-            }
+  //           }
-          }
+  //         }
-          `,
+  //         `,
-        }),
+  //       }),
-      });
+  //     });
-      const resp = await response.json();
+  //     const resp = await response.json();
-      const order = resp.data.order;
+  //     const order = resp.data.order;
-      // Order
+  //     // Order
-      expect(order.id).toBe(`${orderControlData.id}`);
+  //     expect(order.id).toBe(`${orderControlData.id}`);
-      // Market
+  //     // Market
-      expect(order.market.id).toBe(`${marketControlData.id}`);
+  //     expect(order.market.id).toBe(`${marketControlData.id}`);
-      expect(order.market.name).toBe(marketControlData.name);
+  //     expect(order.market.name).toBe(marketControlData.name);
-      expect(order.market.vat).toBe(parseFloat(marketControlData.vat));
+  //     expect(order.market.vat).toBe(parseFloat(marketControlData.vat));
-      expect(order.market.currency).toBe(marketControlData.currency);
+  //     expect(order.market.currency).toBe(marketControlData.currency);
-      expect(order.market.priceAdjustment).toBe(
+  //     expect(order.market.priceAdjustment).toBe(
-        parseFloat(marketControlData.price_adjustment),
+  //       parseFloat(marketControlData.price_adjustment),
-      );
+  //     );
-      // Locale
+  //     // Locale
-      expect(order.locale.id).toBe(`${localeControlData.id}`);
+  //     expect(order.locale.id).toBe(`${localeControlData.id}`);
-      expect(order.locale.value).toBe(localeControlData.value);
+  //     expect(order.locale.value).toBe(localeControlData.value);
-      // Order Rows
+  //     // Order Rows
-      expect(order.rows.length).toBe(orderRowsControlData.length);
+  //     expect(order.rows.length).toBe(orderRowsControlData.length);
-      expect(order.rows[0].id).toBe('' + orderRowsControlData[0].rowid);
+  //     expect(order.rows[0].id).toBe('' + orderRowsControlData[0].rowid);
-      expect(order.rows[1].id).toBe('' + orderRowsControlData[1].rowid);
+  //     expect(order.rows[1].id).toBe('' + orderRowsControlData[1].rowid);
-      expect(order.rows[2].id).toBe('' + orderRowsControlData[2].rowid);
+  //     expect(order.rows[2].id).toBe('' + orderRowsControlData[2].rowid);
-      expect(order.rows[1].orderId).toBe(orderRowsControlData[1].orderid);
+  //     expect(order.rows[1].orderId).toBe(orderRowsControlData[1].orderid);
-    });
+  //   });
-  });
+  // });
  describe('product(id: x)', () => {
    it('should respond with same id for trivial test', async () => {
@@ -56,6 +56,12 @@ export const createAllTestContainers =
      .withExposedPorts(5432)
      .start();
    // const dbLogStream = await dbContainer.logs();
    // dbLogStream
    //   .on('data', (line) => console.log(line))
    //   .on('err', (line) => console.error(line))
    //   .on('end', () => console.log('Stream closed'));
    const dbMappedPort = dbContainer.getMappedPort(5432);
    const dbHost = dbContainer.getHost();
@@ -75,11 +81,6 @@ export const createAllTestContainers =
    await runFile(db, 'db/base/market_locales.sql');
    await runFile(db, 'db/base/i18n-territories.sql');
    // Fields
    await runFile(db, 'db/base/order-fields.sql');
    await runFile(db, 'db/base/order-row_fields.sql');
    await runFile(db, 'db/base/product-fields.sql');
    // Other
    await runFile(db, 'db/data/addresses.sql');
@@ -89,10 +90,7 @@ export const createAllTestContainers =
    await runFile(db, 'db/data/designers-blocked.sql');
    // Orders
    await runFile(db, 'db/data/order-orders.sql');
    await runFile(db, 'db/data/orders.sql');
    await runFile(db, 'db/data/order-rows.sql');
    await runFile(db, 'db/data/order-rows_details.sql');
    // Products
    await runFile(db, 'db/data/product-products.sql');
@@ -1,133 +0,0 @@
 --
 -- PostgreSQL database dump
 --
 -- Dumped from database version 10.14
 -- Dumped by pg_dump version 10.14
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 SET idle_in_transaction_session_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);
 SET check_function_bodies = false;
 SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 --
 -- Data for Name: order-fields; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (213, 'delivery-countryCode', '2011-01-26 17:14:18.077944+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (214, 'confirmType', '2011-01-26 17:14:27.979311+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (215, 'confirmCode', '2011-01-26 17:14:27.988171+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (151, 'countryCode', '2009-11-15 12:54:01.960665+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (152, 'deliveryMethod', '2009-11-15 12:54:02.212188+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (153, 'deliveryPrice', '2009-11-15 12:54:02.221391+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (154, 'deliveryVAT', '2009-11-15 12:54:02.226784+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (155, 'co', '2009-11-16 15:31:50.72867+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (156, 'firstname', '2009-11-16 15:31:50.745995+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (157, 'lastname', '2009-11-16 15:31:50.751422+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (158, 'address', '2009-11-16 15:31:50.755472+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (159, 'zipcode', '2009-11-16 15:31:50.759443+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (160, 'city', '2009-11-16 15:31:50.76344+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (161, 'country', '2009-11-16 15:31:50.767436+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (162, 'att', '2009-11-16 15:31:50.771433+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (163, 'theirReference', '2009-11-16 15:31:50.775419+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (164, 'ourReference', '2009-11-16 15:31:50.779412+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (165, 'invoiceDays', '2009-11-16 15:31:50.783407+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (166, 'invoiceDate', '2009-11-16 15:31:50.787404+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (167, 'sent', '2009-11-16 15:31:50.791368+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (168, 'paid', '2009-11-16 15:31:50.795366+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (169, 'currency', '2009-11-16 15:31:50.799347+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (170, 'paymentType', '2009-11-16 15:31:50.80336+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (171, 'exchangeRate', '2009-11-16 15:31:50.807335+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (172, 'invoiceId', '2009-11-16 15:31:50.815193+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (173, 'invoice', '2009-11-16 15:31:50.819303+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (174, 'customInvoice', '2009-11-16 15:31:50.82332+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (175, 'confirmed', '2009-11-16 15:31:50.827284+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (176, 'delivered', '2009-11-16 15:31:50.83127+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (177, 'company', '2009-11-17 15:06:30.658968+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (178, 'deliverToBillingAddress', '2009-11-17 15:06:30.667595+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (179, 'delivery-name', '2009-11-17 15:06:30.671402+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (180, 'delivery-co', '2009-11-17 15:06:30.675389+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (181, 'delivery-address', '2009-11-17 15:06:30.679374+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (182, 'delivery-zipcode', '2009-11-17 15:06:30.68338+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (183, 'delivery-city', '2009-11-17 15:06:30.687345+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (184, 'email', '2009-11-17 15:06:30.691344+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (185, 'phone', '2009-11-17 15:06:30.695348+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (186, 'socialnr', '2009-11-17 15:06:30.699336+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (187, 'payment_cc', '2009-11-17 15:08:18.064322+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (188, 'newsletter', '2009-11-17 15:09:13.776076+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (189, 'conditions', '2009-11-17 15:09:13.784839+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (190, 'language', '2009-11-17 15:09:26.526853+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (191, 'contractCustomerId', '2009-11-17 21:55:32.233249+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (192, 'contractCode', '2009-11-17 21:55:32.240506+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (193, 'payment_contractCustomerId', '2009-11-17 21:55:32.244541+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (194, 'payment_contractCode', '2009-11-17 21:55:32.248434+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (195, 'readyForHandling', '2009-11-18 12:16:42.37864+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (197, 'debitechId', '2009-11-18 12:31:40.891089+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (198, 'kreditorOCR', '2009-11-29 13:52:03.248231+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (199, 'creditInvoice', '2009-11-29 17:04:03.689028+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (200, 'canceled', '2009-11-29 17:04:04.208346+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (201, 'isCompany', '2009-12-01 22:25:01.338583+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (202, 'VATNumber', '2009-12-01 22:25:01.354251+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (203, 'comment', '2009-12-02 19:18:08.745244+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (204, 'payment_partPaymentOption', '2010-01-04 15:55:30.023052+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (205, 'invoiceSent', '2010-01-29 09:15:33.891493+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (206, 'expirationDate', '2010-01-29 09:15:33.904602+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (207, 'invoicePaid', '2010-02-03 19:55:13.501902+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (208, 'url', '2010-05-10 16:26:58.541157+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (209, 'customerFirstname', '2010-07-01 16:51:56.977628+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (210, 'customerLastname', '2010-07-01 16:51:57.000753+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (211, 'customerEmail', '2010-07-01 16:51:57.004882+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (212, 'customerCellphone', '2010-07-01 16:51:57.00887+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (216, 'auto_confirm', '2011-07-06 17:02:32.152663+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (217, 'customerReference', '2011-12-21 06:58:57.76524+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (218, 'permit-custom-delivery', '2012-03-14 15:53:47.955684+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (219, 'reminder', '2012-08-21 13:29:57.007301+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (235, 'state', '2014-10-28 15:59:20.963126+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (221, 'delivery-firstname', '2013-09-25 11:13:14.701346+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (222, 'delivery-lastname', '2013-09-25 11:13:14.732662+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (223, 'exchangeRateEUR', '2014-02-12 14:05:13.811185+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (224, 'kreditorInvoiceNr', '2014-03-11 13:32:08.955331+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (225, 'deliveredDate', '2014-04-14 14:49:48.218233+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (226, 'paymentOption', '2014-05-06 15:09:17.438912+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (227, 'customerType', '2014-05-06 15:09:17.454562+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (228, 'payment_value', '2014-05-06 17:18:59.657062+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (229, 'checkout2', '2014-05-19 11:00:57.764424+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (230, 'kco_reservation', '2014-05-22 12:12:04.636264+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (231, 'gender', '2014-06-27 14:30:40.139601+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (232, 'houseNumber', '2014-06-27 14:30:40.168737+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (233, 'houseExtension', '2014-07-03 13:53:11.810161+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (234, 'delivery-houseNumber', '2014-08-11 11:56:42.814083+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (236, 'sessionId', '2014-10-30 11:01:13.88878+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (237, 'cancelsOrderId', '2015-01-22 12:28:08.440021+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (238, 'cancelledByOrderId', '2015-01-22 12:28:08.455379+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (239, 'kco_id', '2015-04-29 15:16:54.2688+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (240, 'flyerids', '2016-01-28 13:50:25.216807+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (241, 'skrill_failed_reason_code', '2016-06-14 10:28:35.202593+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (242, 'delivery-state', '2018-07-19 13:29:58.56812+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (243, 'delivery-houseExtension', '2018-09-24 15:20:01.168682+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (244, 'orderlog_id', '2018-12-06 07:53:46.82325+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (245, 'reseller_store', '2019-04-23 16:15:48.932163+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (246, 'order_sum', '2019-05-09 10:36:48.479137+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (247, 'klarna_order_id', '2019-07-31 11:14:41.209652+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (248, 'delivery-email', '2019-10-16 16:07:33.378237+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (249, 'delivery-phone', '2019-10-16 16:07:33.378237+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (250, 'pwinty_id', '2019-11-15 16:32:15.483531+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (251, 'delivery-company', '2020-01-21 10:49:01.525946+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (252, 'address2', '2020-03-25 13:16:14.564305+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (253, 'delivery-address2', '2020-03-25 13:16:14.564305+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (254, 'delivery_address_id', '2020-04-21 07:12:17.389941+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (255, 'billing_address_id', '2020-04-22 12:20:28.143979+02', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (256, 'market', '2020-10-28 12:56:23.052894+01', NULL);
 INSERT INTO public."order-fields" (fieldid, name, inserted, updated) VALUES (257, 'locale', '2020-10-28 12:56:23.052894+01', NULL);
 --
 -- PostgreSQL database dump complete
 --
@@ -1,100 +0,0 @@
 --
 -- PostgreSQL database dump
 --
 -- Dumped from database version 10.14
 -- Dumped by pg_dump version 10.14
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 SET idle_in_transaction_session_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);
 SET check_function_bodies = false;
 SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 --
 -- Data for Name: order-row_fields; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (125, 'sealinglabel_printed', '2010-12-04 16:36:57.928533+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (126, 'imageprocessed', '2011-01-26 17:11:40.644271+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (127, 'imageprocessingrejected', '2011-01-26 17:11:40.644271+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (128, 'resolution', '2011-01-26 17:11:40.644271+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (129, 'imagedonotprint', '2011-01-31 11:04:38.192258+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (93, 'group', '2009-11-15 12:54:02.003423+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (94, 'type', '2009-11-15 12:54:02.007409+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (95, 'artNo', '2009-11-15 12:54:02.011399+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (96, 'path', '2009-11-15 12:54:02.015387+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (97, 'name', '2009-11-15 12:54:02.019383+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (98, 'price', '2009-11-15 12:54:02.023365+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (99, 'width', '2009-11-15 12:54:02.02737+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (100, 'height', '2009-11-15 12:54:02.031362+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (101, 'x', '2009-11-15 12:54:02.035348+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (102, 'y', '2009-11-15 12:54:02.039332+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (103, 'weight', '2009-11-15 12:54:02.043345+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (104, 'designer', '2009-11-15 12:54:02.047325+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (105, 'designerId', '2009-11-15 12:54:02.051316+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (106, 'commission', '2009-11-15 12:54:02.055309+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (107, 'commission_resale', '2009-11-15 12:54:02.059296+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (108, 'status', '2009-11-15 12:54:02.063292+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (109, 'process', '2009-11-15 12:54:02.067274+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (110, 'VAT', '2009-11-15 12:54:02.071262+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (111, 'qty', '2009-11-16 15:31:05.975322+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (112, 'fixedVAT', '2009-11-16 15:31:05.984399+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (113, 'modifier', '2009-11-17 15:07:29.126734+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (114, 'inquiryid', '2009-11-17 17:35:23.424403+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (115, 'code', '2009-11-18 12:29:30.453891+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (116, 'gvId', '2009-11-18 12:38:27.686007+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (117, 'currency', '2009-11-18 12:38:27.688769+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (118, 'comment', '2010-02-24 22:05:48.011688+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (119, 'stockPrice', '2010-03-25 20:19:17.556855+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (120, 'commission_amount', '2010-04-23 17:38:57.599672+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (121, 'stockPriceNote', '2010-05-21 15:22:27.395263+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (122, 'framed', '2010-12-03 16:48:46.562977+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (123, 'mirrored', '2010-12-03 16:48:46.575699+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (124, 'edge', '2010-12-03 16:48:46.57928+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (130, 'no_shipping', '2011-06-23 07:23:15.469812+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (91, 'printId', '2009-11-15 12:54:01.994651+01', '2012-01-24 13:15:18.053708+01');
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (92, 'productId', '2009-11-15 12:54:01.999438+01', '2012-01-24 13:15:18.053708+01');
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (131, 'material', '2012-01-24 13:15:18.053708+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (132, 'materialId', '2012-01-24 13:15:18.053708+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (133, 'stockId', '2012-01-25 13:08:30.273885+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (134, 'categoryId', '2013-05-16 12:22:16.624803+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (135, 'automated', '2014-01-29 14:39:22.084678+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (136, 'uploaded', '2014-01-29 14:39:22.102708+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (137, 'imgHash', '2014-05-20 13:15:01.793219+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (138, 'nameLocalized', '2014-05-20 13:15:01.827614+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (139, 'commission_agency', '2014-07-02 15:50:56.405149+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (140, 'commission_agency_resale', '2014-07-02 16:31:56.915017+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (141, 'commission_agency_amount', '2014-07-02 16:44:17.269389+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (142, 'discountType', '2014-07-02 18:37:16.551602+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (143, 'discountValue', '2014-07-02 18:37:16.573675+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (144, 'measure_unit', '2015-04-29 10:03:44.777182+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (145, 'packed', '2015-05-25 17:40:56.791918+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (146, 'retouch_price', '2017-12-06 17:07:44.181919+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (147, 'percent', '2018-03-13 11:37:21.730052+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (148, 'product_description', '2018-04-11 11:36:56.612066+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (149, 'displayWidth', '2018-05-14 16:08:03.159987+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (150, 'displayHeight', '2018-05-14 16:08:03.164747+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (151, 'imageWidth', '2019-01-23 09:45:24.717112+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (152, 'imageHeight', '2019-01-23 09:45:24.722189+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (153, 'posterHanger', '2019-01-23 09:45:24.726257+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (154, 'pwinty_image_id', '2019-11-15 16:32:15.483531+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (155, 'frame_color', '2019-11-15 16:32:15.483531+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (156, 'pwinty_sku', '2019-11-15 16:32:15.483531+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (157, 'orientation', '2019-12-16 13:18:46.329712+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (158, 'designerPath', '2020-11-04 11:20:27.227453+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (159, 'baseName', '2020-11-05 14:56:36.196463+01', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (160, 'edge_fixed', '2021-04-09 11:29:49.721368+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (161, 'width_mm', '2021-04-19 09:24:30.875672+02', NULL);
 INSERT INTO public."order-row_fields" (fieldid, name, inserted, updated) VALUES (162, 'height_mm', '2021-04-19 09:24:30.875672+02', NULL);
 --
 -- PostgreSQL database dump complete
 --
@@ -1,36 +0,0 @@
 --
 -- PostgreSQL database dump
 --
 -- Dumped from database version 10.14
 -- Dumped by pg_dump version 10.14
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 SET idle_in_transaction_session_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', 'public', false);
 SET check_function_bodies = false;
 SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 --
 -- Data for Name: order-orders; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 INSERT INTO "order-orders" (orderid, inserted, updated) VALUES (1, DEFAULT, NULL);
 INSERT INTO "order-orders" (orderid, inserted, updated) VALUES (2, DEFAULT, NULL);
 INSERT INTO "order-orders" (orderid, inserted, updated) VALUES (3, DEFAULT, NULL);
 INSERT INTO "order-orders" (orderid, inserted, updated) VALUES (4, DEFAULT, NULL);
 INSERT INTO "order-orders" (orderid, inserted, updated) VALUES (5, DEFAULT, NULL);
 INSERT INTO "order-orders" (orderid, inserted, updated) VALUES (6, DEFAULT, NULL);
 INSERT INTO "order-orders" (orderid, inserted, updated) VALUES (7, DEFAULT, NULL);
 INSERT INTO "order-orders" (orderid, inserted, updated) VALUES (8, DEFAULT, NULL);
 INSERT INTO "order-orders" (orderid, inserted, updated) VALUES (9, DEFAULT, NULL);
 INSERT INTO "order-orders" (orderid, inserted, updated) VALUES (10, DEFAULT, NULL);
 --
 -- PostgreSQL database dump complete
 --
@@ -1,49 +0,0 @@
 --
 -- PostgreSQL database dump
 --
 -- Dumped from database version 10.14
 -- Dumped by pg_dump version 10.14
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 SET idle_in_transaction_session_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);
 SET check_function_bodies = false;
 SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 --
 -- Data for Name: order-rows; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (1, 1, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (1, 2, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (1, 3, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (1, 4, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (2, 5, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (2, 6, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (3, 7, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (3, 8, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (3, 9, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (3, 10, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (4, 11, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (5, 12, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (6, 13, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (7, 14, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (7, 15, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (8, 16, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (8, 17, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (9, 18, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (9, 19, DEFAULT, NULL);
 INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (10, 20, DEFAULT, NULL);
 --
 -- PostgreSQL database dump complete
 --
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
-- Dumped from database version 10.14
+-- Dumped from database version 13.5
-- Dumped by pg_dump version 10.14
+-- Dumped by pg_dump version 14.0
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -16,25 +16,11 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 --
 -- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
 --
 CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
 --
 -- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
 --
 COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
 --
 -- Name: unaccent; Type: EXTENSION; Schema: -; Owner: -
 --
-CREATE EXTENSION IF NOT EXISTS unaccent WITH SCHEMA public;
+CREATE EXTENSION IF NOT EXISTS unaccent WITH SCHEMA pg_catalog;
 --
@@ -44,6 +30,59 @@ CREATE EXTENSION IF NOT EXISTS unaccent WITH SCHEMA public;
 COMMENT ON EXTENSION unaccent IS 'text search dictionary that removes accents';
 --
 -- Name: order_row_status; Type: TYPE; Schema: public; Owner: -
 --
 CREATE TYPE public.order_row_status AS ENUM (
    'no_status',
    'process',
    'error',
    'print',
    'packed',
    'cancelled',
    'sent'
 );
 --
 -- Name: order_row_sub_type; Type: TYPE; Schema: public; Owner: -
 --
 CREATE TYPE public.order_row_sub_type AS ENUM (
    'no_subtype',
    'wallpaper',
    'canvas',
    'poster',
    'framed_print',
    'inquiry_wallpaper',
    'inquiry_canvas',
    'inquiry_poster',
    'inquiry_framed_print',
    'retouch_fee',
    'contract_customer_discount',
    'discount_code',
    'wallpaper_kit',
    'canvas_frame',
    'sample',
    'admin_product'
 );
 --
 -- Name: order_row_type; Type: TYPE; Schema: public; Owner: -
 --
 CREATE TYPE public.order_row_type AS ENUM (
    'discount',
    'fee',
    'print',
    'stock',
    'sample',
    'refund'
 );
 --
 -- Name: field(anyelement, anyarray); Type: FUNCTION; Schema: public; Owner: -
 --
@@ -227,6 +266,9 @@ BEGIN
 	-- locale
    ELSIF new.fieldid = 257 THEN
        UPDATE orders SET locale = new.value WHERE id = new.orderid;
 	-- paypal transaction id
    ELSIF new.fieldid = 258 THEN
        UPDATE orders SET paypal_transaction_id = new.value WHERE id = new.orderid;
    END IF;
    RETURN new;
 END;
@@ -322,7 +364,7 @@ $$;
 SET default_tablespace = '';
-SET default_with_oids = false;
+SET default_table_access_method = heap;
 --
 -- Name: delivery-methods; Type: TABLE; Schema: public; Owner: -
@@ -369,7 +411,9 @@ CREATE TABLE public.addresses (
    first_name character varying,
    last_name character varying,
    address2 character varying,
-    state character varying
+    state character varying,
    email text,
    phone text
 );
@@ -550,6 +594,19 @@ CREATE SEQUENCE public.cache_id_seq
 ALTER SEQUENCE public.cache_id_seq OWNED BY public.cache.id;
 --
 -- Name: carts; Type: TABLE; Schema: public; Owner: -
 --
 CREATE TABLE public.carts (
    uuid uuid NOT NULL,
    inserted timestamp with time zone DEFAULT now() NOT NULL,
    order_id integer,
    klarna_order_id text,
    content jsonb NOT NULL
 );
 --
 -- Name: categories; Type: TABLE; Schema: public; Owner: -
 --
@@ -761,6 +818,7 @@ CREATE TABLE public.collections (
    face_image_key text,
    author text,
    author_handle text,
    show_only_default boolean DEFAULT false NOT NULL,
    CONSTRAINT collections_default_product_list_tab_check CHECK ((default_product_list_tab = ANY (ARRAY['wallpapers'::text, 'canvas-prints'::text, 'framed-prints'::text, 'posters'::text])))
 );
@@ -1062,7 +1120,8 @@ CREATE TABLE public.designers (
    wallpaper_image_id integer,
    canvas_image_id integer,
    poster_image_id integer,
-    framed_print_image_id integer
+    framed_print_image_id integer,
    payout_platform_id text
 );
@@ -1559,6 +1618,19 @@ CREATE TABLE public.interiors (
 );
 --
 -- Name: interiors2; Type: TABLE; Schema: public; Owner: -
 --
 CREATE TABLE public.interiors2 (
    id integer NOT NULL,
    print_id integer NOT NULL,
    room_id integer,
    "position" smallint NOT NULL,
    create_date timestamp with time zone NOT NULL
 );
 --
 -- Name: interiors_id_seq; Type: SEQUENCE; Schema: public; Owner: -
 --
@@ -2107,6 +2179,46 @@ CREATE TABLE public."order-rows_details" (
 );
 --
 -- Name: order_rows; Type: TABLE; Schema: public; Owner: -
 --
 CREATE TABLE public.order_rows (
    id integer NOT NULL,
    type public.order_row_type NOT NULL,
    sub_type public.order_row_sub_type NOT NULL,
    status public.order_row_status DEFAULT 'no_status'::public.order_row_status,
    order_id integer,
    designer_id integer,
    inserted timestamp with time zone DEFAULT now(),
    updated timestamp with time zone,
    price numeric NOT NULL,
    commission_amount numeric DEFAULT 0.0,
    data jsonb
 );
 --
 -- Name: COLUMN order_rows.price; Type: COMMENT; Schema: public; Owner: -
 --
 COMMENT ON COLUMN public.order_rows.price IS 'Price without VAT';
 --
 -- Name: order_rows_id_seq; Type: SEQUENCE; Schema: public; Owner: -
 --
 ALTER TABLE public.order_rows ALTER COLUMN id ADD GENERATED ALWAYS AS IDENTITY (
    SEQUENCE NAME public.order_rows_id_seq
    START WITH 2500000
    INCREMENT BY 1
    NO MINVALUE
    NO MAXVALUE
    CACHE 1
 );
 --
 -- Name: orderlogs; Type: TABLE; Schema: public; Owner: -
 --
@@ -2187,7 +2299,8 @@ CREATE TABLE public.orders (
    delivery_address_id integer,
    flyer_ids text,
    market text,
-    locale text
+    locale text,
    paypal_transaction_id text
 );
@@ -2443,40 +2556,6 @@ CREATE TABLE public."product-products_products" (
 );
 --
 -- Name: product-status-history; Type: TABLE; Schema: public; Owner: -
 --
 CREATE TABLE public."product-status-history" (
    id integer NOT NULL,
    rowid integer NOT NULL,
    action integer NOT NULL,
    reason integer NOT NULL,
    when_field integer NOT NULL,
    customer_satisfaction integer NOT NULL,
    added_at timestamp with time zone DEFAULT now() NOT NULL
 );
 --
 -- Name: product-status-history_id_seq; Type: SEQUENCE; Schema: public; Owner: -
 --
 CREATE SEQUENCE public."product-status-history_id_seq"
    START WITH 1
    INCREMENT BY 1
    NO MINVALUE
    NO MAXVALUE
    CACHE 1;
 --
 -- Name: product-status-history_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
 --
 ALTER SEQUENCE public."product-status-history_id_seq" OWNED BY public."product-status-history".id;
 --
 -- Name: product-status-history_lookup; Type: TABLE; Schema: public; Owner: -
 --
@@ -2781,7 +2860,8 @@ CREATE TABLE public.samples (
    quantity integer NOT NULL,
    date_processed timestamp with time zone,
    status character varying NOT NULL,
-    order_id integer
+    order_id integer,
    order_row_id integer
 );
@@ -3086,16 +3166,14 @@ CREATE MATERIALIZED VIEW public.test AS
 --
 CREATE VIEW public.v_analytics_contract_customer_discounts AS
- SELECT rows.orderid,
+ SELECT order_rows.id,
-    rows.rowid,
+    order_rows.order_id,
-    vat.value AS vat,
+    orders.delivery_vat,
-    (price.value)::numeric AS price,
+    order_rows.price,
-    round(((percent.value)::numeric / (100)::numeric), 2) AS percent
+    round((((order_rows.data ->> 'percent'::text))::numeric / (100)::numeric), 2) AS percent
-   FROM ((((public."order-rows" rows
+   FROM (public.order_rows
-     JOIN public."order-rows_details" modifier ON (((rows.rowid = modifier.rowid) AND (modifier.fieldid = 113) AND (modifier.value = 'contractCustomerDiscount'::text))))
+     JOIN public.orders ON ((orders.id = order_rows.order_id)))
-     LEFT JOIN public."order-rows_details" price ON (((rows.rowid = price.rowid) AND (price.fieldid = 98))))
+  WHERE (order_rows.sub_type = 'contract_customer_discount'::public.order_row_sub_type);
     LEFT JOIN public."order-rows_details" vat ON (((rows.rowid = vat.rowid) AND (vat.fieldid = 110))))
     LEFT JOIN public."order-rows_details" percent ON (((rows.rowid = percent.rowid) AND (percent.fieldid = 147))));
 --
@@ -3173,8 +3251,8 @@ CREATE VIEW public.v_analytics_order_rows AS
            ELSE productgroup.value
        END AS type,
    material.value AS material,
-    width.value AS width,
+    COALESCE(((width_mm.value)::double precision / (10)::double precision), (width.value)::double precision) AS width,
-    height.value AS height,
+    COALESCE(((height_mm.value)::double precision / (10)::double precision), (height.value)::double precision) AS height,
        CASE
            WHEN (status.value = 'process'::text) THEN 'Ready for processing'::text
            WHEN (status.value = 'print'::text) THEN 'Ready for printing'::text
@@ -3197,7 +3275,7 @@ CREATE VIEW public.v_analytics_order_rows AS
    frame_color.value AS framed_print_frame,
    (price.value)::double precision AS price,
    vat.value AS vat
-   FROM ((((((((((((((((((((((((((public."order-rows" orderrows
+   FROM ((((((((((((((((((((((((((((public."order-rows" orderrows
     LEFT JOIN public."order-rows_details" artno ON (((orderrows.rowid = artno.rowid) AND (artno.fieldid = 95))))
     LEFT JOIN public."order-rows_details" productid ON (((orderrows.rowid = productid.rowid) AND (productid.fieldid = 92))))
     LEFT JOIN public."order-rows_details" name ON (((orderrows.rowid = name.rowid) AND (name.fieldid = 97))))
@@ -3210,6 +3288,8 @@ CREATE VIEW public.v_analytics_order_rows AS
     LEFT JOIN public."order-rows_details" material ON (((orderrows.rowid = material.rowid) AND (material.fieldid = 131))))
     LEFT JOIN public."order-rows_details" width ON (((orderrows.rowid = width.rowid) AND (width.fieldid = 99))))
     LEFT JOIN public."order-rows_details" height ON (((orderrows.rowid = height.rowid) AND (height.fieldid = 100))))
     LEFT JOIN public."order-rows_details" width_mm ON (((orderrows.rowid = width_mm.rowid) AND (width_mm.fieldid = 161))))
     LEFT JOIN public."order-rows_details" height_mm ON (((orderrows.rowid = height_mm.rowid) AND (height_mm.fieldid = 162))))
     LEFT JOIN public."order-rows_details" status ON (((orderrows.rowid = status.rowid) AND (status.fieldid = 108))))
     LEFT JOIN public."order-rows_details" commission ON (((orderrows.rowid = commission.rowid) AND (commission.fieldid = 106))))
     LEFT JOIN public."order-rows_details" commission_amount ON (((orderrows.rowid = commission_amount.rowid) AND (commission_amount.fieldid = 120))))
@@ -3667,7 +3747,8 @@ CREATE MATERIALIZED VIEW public.v_esales_product_categories AS
 --
 CREATE VIEW public.v_interior_image_urls AS
- SELECT "product-printproducts".productid,
+ SELECT interiors.id AS interior_id,
    "product-printproducts".productid,
    interiors.print_id,
    "product-printproducts".groupid AS product_group,
    rooms.id AS room_id,
@@ -4778,13 +4859,6 @@ ALTER TABLE ONLY public."product-printproducts" ALTER COLUMN printid SET DEFAULT
 ALTER TABLE ONLY public."product-products" ALTER COLUMN productid SET DEFAULT nextval('public."product-products_productid_seq"'::regclass);
 --
 -- Name: product-status-history id; Type: DEFAULT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public."product-status-history" ALTER COLUMN id SET DEFAULT nextval('public."product-status-history_id_seq"'::regclass);
 --
 -- Name: product-status-history_lookup id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -4960,6 +5034,14 @@ ALTER TABLE ONLY public.cache
    ADD CONSTRAINT cache_pkey PRIMARY KEY (id);
 --
 -- Name: carts carts_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public.carts
    ADD CONSTRAINT carts_pkey PRIMARY KEY (uuid);
 --
 -- Name: categories categories_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -5252,6 +5334,14 @@ ALTER TABLE ONLY public.inquiry_messages
    ADD CONSTRAINT inquiry_messages_pkey PRIMARY KEY (id);
 --
 -- Name: interiors2 interiors2_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public.interiors2
    ADD CONSTRAINT interiors2_pkey PRIMARY KEY (id);
 --
 -- Name: interiors interiors_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -5396,6 +5486,14 @@ ALTER TABLE ONLY public."order-rows"
    ADD CONSTRAINT "order-rows_pkey" PRIMARY KEY (rowid);
 --
 -- Name: order_rows order_rows_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public.order_rows
    ADD CONSTRAINT order_rows_pkey PRIMARY KEY (id);
 --
 -- Name: orderlogs orderlogs_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -5528,14 +5626,6 @@ ALTER TABLE ONLY public."product-status-history_lookup"
    ADD CONSTRAINT "product-status-history-lookup_pkey" PRIMARY KEY (id);
 --
 -- Name: product-status-history product-status-history_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public."product-status-history"
    ADD CONSTRAINT "product-status-history_pkey" PRIMARY KEY (id);
 --
 -- Name: product-stockprices product-stockprices_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -5853,6 +5943,13 @@ CREATE INDEX invoices_inserted ON public.invoices USING btree (inserted DESC NUL
 CREATE INDEX invoices_sent ON public.invoices USING btree (invoice_sent);
 --
 -- Name: ix_billing_address_id; Type: INDEX; Schema: public; Owner: -
 --
 CREATE INDEX ix_billing_address_id ON public.orders USING btree (billing_address_id);
 --
 -- Name: ix_confirmed; Type: INDEX; Schema: public; Owner: -
 --
@@ -5867,6 +5964,13 @@ CREATE INDEX ix_confirmed ON public."order-orders_fields" USING btree (value) WH
 CREATE INDEX ix_creditinvoice ON public."order-orders_fields" USING btree (value) WHERE (fieldid = 199);
 --
 -- Name: ix_delivery_address_id; Type: INDEX; Schema: public; Owner: -
 --
 CREATE INDEX ix_delivery_address_id ON public.orders USING btree (delivery_address_id);
 --
 -- Name: ix_email; Type: INDEX; Schema: public; Owner: -
 --
@@ -5888,6 +5992,13 @@ CREATE INDEX "ix_i18n-texts_category" ON public."i18n-texts" USING btree (catego
 CREATE INDEX ix_invoiceid ON public."order-orders_fields" USING btree (value) WHERE (fieldid = 172);
 --
 -- Name: ix_samples_address_id; Type: INDEX; Schema: public; Owner: -
 --
 CREATE INDEX ix_samples_address_id ON public.samples USING btree (address_id);
 --
 -- Name: keywords_value_idx; Type: INDEX; Schema: public; Owner: -
 --
@@ -5911,6 +6022,34 @@ CREATE INDEX "order-rows_details_value_key" ON public."order-rows_details" USING
 ALTER TABLE public."order-rows_details" CLUSTER ON "order-rows_details_value_key";
 --
 -- Name: order_rows_designer_id_idx; Type: INDEX; Schema: public; Owner: -
 --
 CREATE INDEX order_rows_designer_id_idx ON public.order_rows USING btree (designer_id);
 --
 -- Name: order_rows_expr_idx; Type: INDEX; Schema: public; Owner: -
 --
 CREATE INDEX order_rows_expr_idx ON public.order_rows USING btree (((data ->> 'inquiryid'::text)));
 --
 -- Name: order_rows_expr_idx1; Type: INDEX; Schema: public; Owner: -
 --
 CREATE INDEX order_rows_expr_idx1 ON public.order_rows USING btree (((data ->> 'code'::text)));
 --
 -- Name: order_rows_expr_idx2; Type: INDEX; Schema: public; Owner: -
 --
 CREATE INDEX order_rows_expr_idx2 ON public.order_rows USING btree (((data ->> 'artNo'::text)));
 --
 -- Name: order_rows_inserted_index; Type: INDEX; Schema: public; Owner: -
 --
@@ -5918,6 +6057,34 @@ ALTER TABLE public."order-rows_details" CLUSTER ON "order-rows_details_value_key
 CREATE INDEX order_rows_inserted_index ON public."order-rows" USING btree (inserted);
 --
 -- Name: order_rows_order_id_idx; Type: INDEX; Schema: public; Owner: -
 --
 CREATE INDEX order_rows_order_id_idx ON public.order_rows USING btree (order_id);
 --
 -- Name: order_rows_status_idx; Type: INDEX; Schema: public; Owner: -
 --
 CREATE INDEX order_rows_status_idx ON public.order_rows USING btree (status);
 --
 -- Name: order_rows_sub_type_idx; Type: INDEX; Schema: public; Owner: -
 --
 CREATE INDEX order_rows_sub_type_idx ON public.order_rows USING btree (sub_type);
 --
 -- Name: order_rows_type_idx; Type: INDEX; Schema: public; Owner: -
 --
 CREATE INDEX order_rows_type_idx ON public.order_rows USING btree (type);
 --
 -- Name: orderid_idx; Type: INDEX; Schema: public; Owner: -
 --
@@ -6081,280 +6248,287 @@ CREATE RULE v_product_keyword_insert AS
 -- Name: order-orders trig_copy_order; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER trig_copy_order AFTER INSERT ON public."order-orders" FOR EACH ROW EXECUTE PROCEDURE public.function_copy_order();
+CREATE TRIGGER trig_copy_order AFTER INSERT ON public."order-orders" FOR EACH ROW EXECUTE FUNCTION public.function_copy_order();
 --
 -- Name: order-orders trig_copy_order_date; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER trig_copy_order_date AFTER UPDATE OF inserted ON public."order-orders" FOR EACH ROW EXECUTE PROCEDURE public.function_copy_order_date();
+CREATE TRIGGER trig_copy_order_date AFTER UPDATE OF inserted ON public."order-orders" FOR EACH ROW EXECUTE FUNCTION public.function_copy_order_date();
 --
 -- Name: order-orders_fields trig_copy_order_field; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER trig_copy_order_field AFTER INSERT OR UPDATE ON public."order-orders_fields" FOR EACH ROW EXECUTE PROCEDURE public.function_copy_order_field();
+CREATE TRIGGER trig_copy_order_field AFTER INSERT OR UPDATE ON public."order-orders_fields" FOR EACH ROW EXECUTE FUNCTION public.function_copy_order_field();
 --
 -- Name: cache updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public.cache FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public.cache FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: contract_customers updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public.contract_customers FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public.contract_customers FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: delivery-methods updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."delivery-methods" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."delivery-methods" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: delivery-methods_prices updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."delivery-methods_prices" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."delivery-methods_prices" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: designers updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public.designers FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public.designers FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: designers_history updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public.designers_history FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public.designers_history FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: discount_codes updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public.discount_codes FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public.discount_codes FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: i18n-currencies updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-currencies" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-currencies" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: i18n-currencies_names updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-currencies_names" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-currencies_names" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: i18n-currencies_territories updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-currencies_territories" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-currencies_territories" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: i18n-languages updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-languages" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-languages" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: i18n-languages_names updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-languages_names" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-languages_names" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: i18n-languages_territories updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-languages_territories" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-languages_territories" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: i18n-territories updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-territories" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-territories" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: i18n-territories_names updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-territories_names" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."i18n-territories_names" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: inquiries updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public.inquiries FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public.inquiries FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: order-fields updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."order-fields" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."order-fields" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: order-orders updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."order-orders" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."order-orders" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: order-orders_fields updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."order-orders_fields" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."order-orders_fields" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: order-row_fields updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."order-row_fields" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."order-row_fields" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: order-rows updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."order-rows" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."order-rows" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: order-rows_details updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."order-rows_details" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."order-rows_details" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: order_rows updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
 CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public.order_rows FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: product-fields updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-fields" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-fields" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: product-groups updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-groups" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-groups" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: product-materials updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-materials" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-materials" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: product-printprices updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-printprices" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-printprices" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: product-printproducts updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-printproducts" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-printproducts" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: product-products updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-products" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-products" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: product-products_fields updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-products_fields" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-products_fields" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: product-stockprices updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-stockprices" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-stockprices" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: product-stockproducts updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-stockproducts" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-stockproducts" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: product-types updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-types" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."product-types" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: stock-items updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."stock-items" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."stock-items" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: stock-places updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."stock-places" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."stock-places" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: stock-stock updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."stock-stock" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."stock-stock" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: stock-stock_data updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."stock-stock_data" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."stock-stock_data" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
 -- Name: stock-stock_data_fields updated_timestamp; Type: TRIGGER; Schema: public; Owner: -
 --
-CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."stock-stock_data_fields" FOR EACH ROW EXECUTE PROCEDURE public.updated_timestamp();
+CREATE TRIGGER updated_timestamp BEFORE UPDATE ON public."stock-stock_data_fields" FOR EACH ROW EXECUTE FUNCTION public.updated_timestamp();
 --
@@ -6429,6 +6603,14 @@ ALTER TABLE ONLY public.categories
    ADD CONSTRAINT canvas_image_fk FOREIGN KEY (canvas_image_id) REFERENCES public.teaser_images(id) ON DELETE SET NULL;
 --
 -- Name: carts carts_order_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public.carts
    ADD CONSTRAINT carts_order_id_fkey FOREIGN KEY (order_id) REFERENCES public.orders(id);
 --
 -- Name: category_texts categories_categories_texts_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -6973,6 +7155,22 @@ ALTER TABLE ONLY public.invoices
    ADD CONSTRAINT order_fk FOREIGN KEY (order_id) REFERENCES public."order-orders"(orderid);
 --
 -- Name: order_rows order_rows_designer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public.order_rows
    ADD CONSTRAINT order_rows_designer_id_fkey FOREIGN KEY (designer_id) REFERENCES public.designers(designerid);
 --
 -- Name: order_rows order_rows_order_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public.order_rows
    ADD CONSTRAINT order_rows_order_id_fkey FOREIGN KEY (order_id) REFERENCES public.orders(id);
 --
 -- Name: categories photo_wallpaper_image_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -7109,46 +7307,6 @@ ALTER TABLE ONLY public."product-products_products"
    ADD CONSTRAINT "product-products_products_productid2_fkey" FOREIGN KEY (productid2) REFERENCES public."product-products"(productid) ON DELETE RESTRICT;
 --
 -- Name: product-status-history product-status-history-lookup-action_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public."product-status-history"
    ADD CONSTRAINT "product-status-history-lookup-action_fkey" FOREIGN KEY (action) REFERENCES public."product-status-history_lookup"(id) ON UPDATE CASCADE ON DELETE CASCADE;
 --
 -- Name: product-status-history product-status-history_customer_satisfaction_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public."product-status-history"
    ADD CONSTRAINT "product-status-history_customer_satisfaction_fkey" FOREIGN KEY (customer_satisfaction) REFERENCES public."product-status-history_lookup"(id) ON UPDATE CASCADE ON DELETE CASCADE;
 --
 -- Name: product-status-history product-status-history_reason_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public."product-status-history"
    ADD CONSTRAINT "product-status-history_reason_fkey" FOREIGN KEY (reason) REFERENCES public."product-status-history_lookup"(id) ON UPDATE CASCADE ON DELETE CASCADE;
 --
 -- Name: product-status-history product-status-history_rowid_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public."product-status-history"
    ADD CONSTRAINT "product-status-history_rowid_fkey" FOREIGN KEY (rowid) REFERENCES public."order-rows"(rowid) ON UPDATE CASCADE ON DELETE CASCADE;
 --
 -- Name: product-status-history product-status-history_when_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public."product-status-history"
    ADD CONSTRAINT "product-status-history_when_fkey" FOREIGN KEY (when_field) REFERENCES public."product-status-history_lookup"(id) ON UPDATE CASCADE ON DELETE CASCADE;
 --
 -- Name: product-stockproducts product-stockproducts_priceid_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -7237,6 +7395,14 @@ ALTER TABLE ONLY public.samples
    ADD CONSTRAINT samples_order_id_fkey FOREIGN KEY (order_id) REFERENCES public.orders(id);
 --
 -- Name: samples samples_order_row_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 ALTER TABLE ONLY public.samples
    ADD CONSTRAINT samples_order_row_id_fkey FOREIGN KEY (order_row_id) REFERENCES public.order_rows(id);
 --
 -- Name: slideshow_slides slideshow_slides_market_locale_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -98,7 +98,7 @@ for (const id of [...Array(N + 1).keys()].slice(1)) {
  // Since the graphql query for designers is
  // sorted on name we force the second designer
  // to to top of the name sort.
-  // This is because we insert order-rows on designer with
+  // This is because we insert order on designer with
  // id = 2
  if (id === 2) {
    key.name = `'a'`;
@@ -26,10 +26,7 @@ export const execShellCommand = (cmd) => {
    'designer_texts',
    'designers-blocked',
    'invoices',
    'order-orders',
    'orders',
    'order-rows',
    'order-rows_details',
    'product-products',
  ];
@@ -1,32 +0,0 @@
 import _ from 'lodash';
 import { saveFromTemplate } from './common.js';
 // INSERT INTO public."order-orders" (orderid, inserted, updated) VALUES (187825, '2016-02-20 14:04:45.47498+01', '2016-02-20 22:42:46.132664+01');
 const keys = {
  orderid: null,
  inserted: 'DEFAULT',
  updated: 'NULL',
 };
 const inserts = [];
 const N = 10;
 for (const id of [...Array(N + 1).keys()].slice(1)) {
  const key = Object.assign({}, keys, {
    orderid: id,
  });
  const insertString = `INSERT INTO "order-orders" (orderid, inserted, updated) VALUES (${Object.values(
    key,
  ).join(', ')});`;
  inserts.push(insertString);
 }
 saveFromTemplate(
  'templates/order-orders.sql',
  '../db/data/order-orders.sql',
  '{x}',
  inserts.join('\n'),
 );
@@ -1,51 +0,0 @@
 import _ from 'lodash';
 import { saveFromTemplate } from './common.js';
 // INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (2, DEFAULT, '2011-01-01 13:45:32.055767+01', NULL);
 const keys = {
  orderid: null,
  rowid: 'DEFAULT',
  inserted: 'DEFAULT',
  updated: `NULL`,
 };
 const inserts = [];
 const rows = [
  { orderid: 1, rowid: 1 },
  { orderid: 1, rowid: 2 },
  { orderid: 1, rowid: 3 },
  { orderid: 1, rowid: 4 },
  { orderid: 2, rowid: 5 },
  { orderid: 2, rowid: 6 },
  { orderid: 3, rowid: 7 },
  { orderid: 3, rowid: 8 },
  { orderid: 3, rowid: 9 },
  { orderid: 3, rowid: 10 },
  { orderid: 4, rowid: 11 },
  { orderid: 5, rowid: 12 },
  { orderid: 6, rowid: 13 },
  { orderid: 7, rowid: 14 },
  { orderid: 7, rowid: 15 },
  { orderid: 8, rowid: 16 },
  { orderid: 8, rowid: 17 },
  { orderid: 9, rowid: 18 },
  { orderid: 9, rowid: 19 },
  { orderid: 10, rowid: 20 },
 ];
 for (const row of rows) {
  inserts.push(
    `INSERT INTO public."order-rows" (orderid, rowid, inserted, updated) VALUES (${Object.values(
      Object.assign({}, keys, row),
    ).join(', ')});`,
  );
 }
 saveFromTemplate(
  'templates/order-rows.sql',
  '../db/data/order-rows.sql',
  '{x}',
  inserts.join('\n'),
 );
@@ -1,274 +0,0 @@
 import _ from 'lodash';
 import {
  saveFromTemplate,
  randomProductGroup,
  lorem,
  randomProductType,
  randomArtNo,
  randomLocaleObject,
  randomFrom,
  randomStockId,
  ioBool,
  io,
 } from './common.js';
 const fields = {
  printId: { defaultValue: '', fieldid: 91 },
  productId: { defaultValue: '', fieldid: 92 },
  group: { defaultValue: '', fieldid: 93 },
  type: { defaultValue: '', fieldid: 94 },
  artNo: { defaultValue: '', fieldid: 95 },
  path: { defaultValue: '', fieldid: 96 },
  name: { defaultValue: '', fieldid: 97 },
  price: { defaultValue: '', fieldid: 98 },
  width: { defaultValue: '', fieldid: 99 },
  height: { defaultValue: '', fieldid: 100 },
  x: { defaultValue: '', fieldid: 101 },
  y: { defaultValue: '', fieldid: 102 },
  weight: { defaultValue: 1, fieldid: 103 },
  designer: { defaultValue: '', fieldid: 104 },
  designerId: { defaultValue: '', fieldid: 105 },
  commission: { defaultValue: '', fieldid: 106 },
  commission_resale: { defaultValue: '', fieldid: 107 },
  status: { defaultValue: '', fieldid: 108 },
  process: { defaultValue: '', fieldid: 109 },
  VAT: { defaultValue: '', fieldid: 110 },
  qty: { defaultValue: '', fieldid: 111 },
  fixedVAT: { defaultValue: '', fieldid: 112 },
  modifier: { defaultValue: '', fieldid: 113 },
  inquiryid: { defaultValue: '', fieldid: 114 },
  code: { defaultValue: '', fieldid: 115 },
  gvId: { defaultValue: '', fieldid: 116 },
  currency: { defaultValue: '', fieldid: 117 },
  comment: { defaultValue: '', fieldid: 118 },
  stockPrice: { defaultValue: '', fieldid: 119 },
  commission_amount: { defaultValue: '', fieldid: 120 },
  stockPriceNote: { defaultValue: '', fieldid: 121 },
  framed: { defaultValue: '', fieldid: 122 },
  mirrored: { defaultValue: '', fieldid: 123 },
  edge: { defaultValue: '', fieldid: 124 },
  sealinglabel_printed: { defaultValue: '', fieldid: 125 },
  imageprocessed: { defaultValue: '', fieldid: 126 },
  imageprocessingrejected: { defaultValue: '', fieldid: 127 },
  resolution: { defaultValue: '', fieldid: 128 },
  imagedonotprint: { defaultValue: '', fieldid: 129 },
  no_shipping: { defaultValue: '', fieldid: 130 },
  material: { defaultValue: '', fieldid: 131 },
  materialId: { defaultValue: '', fieldid: 132 },
  stockId: { defaultValue: '', fieldid: 133 },
  categoryId: { defaultValue: '', fieldid: 134 },
  automated: { defaultValue: '', fieldid: 135 },
  uploaded: { defaultValue: '', fieldid: 136 },
  imgHash: { defaultValue: '', fieldid: 137 },
  nameLocalized: { defaultValue: '', fieldid: 138 },
  commission_agency: { defaultValue: '', fieldid: 139 },
  commission_agency_resale: { defaultValue: '', fieldid: 140 },
  commission_agency_amount: { defaultValue: '', fieldid: 141 },
  discountType: { defaultValue: '', fieldid: 142 },
  discountValue: { defaultValue: '', fieldid: 143 },
  measure_unit: { defaultValue: '', fieldid: 144 },
  packed: { defaultValue: '', fieldid: 145 },
  retouch_price: { defaultValue: '', fieldid: 146 },
  percent: { defaultValue: '', fieldid: 147 },
  product_description: { defaultValue: '', fieldid: 148 },
  displayWidth: { defaultValue: '', fieldid: 149 },
  displayHeight: { defaultValue: '', fieldid: 150 },
  imageWidth: { defaultValue: '', fieldid: 151 },
  imageHeight: { defaultValue: '', fieldid: 152 },
  posterHanger: { defaultValue: '', fieldid: 153 },
  pwinty_image_id: { defaultValue: '', fieldid: 154 },
  frame_color: { defaultValue: '', fieldid: 155 },
  pwinty_sku: { defaultValue: '', fieldid: 156 },
  orientation: { defaultValue: '', fieldid: 157 },
  designerPath: { defaultValue: '', fieldid: 158 },
  baseName: { defaultValue: '', fieldid: 159 },
  edge_fixed: { defaultValue: '', fieldid: 160 },
  width_mm: { defaultValue: '', fieldid: 161 },
  height_mm: { defaultValue: '', fieldid: 162 },
 };
 const inserts = [];
 const N = 20;
 for (const id of [...Array(N + 1).keys()].slice(1)) {
  const locale = randomLocaleObject();
  const base = JSON.parse(JSON.stringify(fields));
  const f = _.merge(base, {
    printId: { defaultValue: _.random(1, 10) },
    productId: { defaultValue: _.random(1, 10) },
    group: {
      defaultValue: randomFrom([
        'wallpaper',
        'poster',
        'photo-wallpaper',
        'canvas',
        'doityourselfframe',
        'framed-print',
      ]),
    },
    type: {
      defaultValue: randomFrom([
        'EUR',
        'GBP',
        'fixed',
        'gift-voucher',
        'SEK',
        'USD',
        'doityourselfframe',
        'DKK',
        'tiling',
        'PLN',
        'custom',
        'NOK',
        'scaling',
        '%',
        'stock',
      ]),
    },
    artNo: { defaultValue: randomArtNo() },
    path: {
      defaultValue: _.kebabCase(`${lorem.generateWords(_.random(1, 3))}`),
    },
    name: {
      defaultValue: _.startCase(`${lorem.generateWords(_.random(3, 5))}`),
    },
    price: { defaultValue: _.random(-200.5, 40000.5) },
    width: { defaultValue: _.random(60, 500) },
    height: { defaultValue: _.random(60, 500) },
    x: { defaultValue: Math.random() },
    y: { defaultValue: Math.random() },
    designer: {
      defaultValue: _.kebabCase(`${lorem.generateWords(_.random(1, 3))}`),
    },
    designerId: { defaultValue: 2 },
    commission: { defaultValue: _.random(0, 25) },
    commission_resale: { defaultValue: _.random(0, 25) },
    status: {
      defaultValue: randomFrom([
        'sent',
        'print',
        'process',
        'cancelled',
        'pack',
      ]),
    },
    process: { defaultValue: ioBool() },
    VAT: {
      defaultValue: randomFrom([
        1.19, 1.25, 1.22, 1.0, 1.21, 1.2, 1.16, 1.25, 1, 1.23, 1.24,
      ]),
    },
    qty: { defaultValue: io() },
    fixedVAT: {
      defaultValue: randomFrom([
        1, 1.0, 1.16, 1.19, 1.2, 1.21, 1.22, 1.23, 1.24, 1.25, 1.25,
      ]),
    },
    modifier: {
      defaultValue: randomFrom([
        'discount',
        'contractCustomerDiscount',
        'billingFee',
        'giftVoucher',
      ]),
    },
    inquiryid: { defaultValue: _.random(1, 10) },
    code: {
      defaultValue: randomFrom([
        'katherinetriana2020',
        '4FFD1CFQ86',
        'sarahfakhraldin2021',
        'mepicalaetiqueta2021',
        'mammaformica2020',
        'wrappwall2944',
        'kine15',
        'themakeupdummy2021a',
        'sophiaelizabeth2020',
        'Laura10',
        'charlottep2021',
      ]),
    },
    gvId: { defaultValue: '' },
    currency: { defaultValue: _.trim(locale.currency, "'") },
    comment: { defaultValue: lorem.generateSentences(_.random(2, 5)) },
    stockPrice: { defaultValue: 1 },
    commission_amount: { defaultValue: _.random(-10, 300) },
    stockPriceNote: { defaultValue: 'NULL' },
    framed: { defaultValue: io() },
    mirrored: { defaultValue: io() },
    edge: { defaultValue: randomFrom([0, 'black', 'image', '', 'white']) },
    sealinglabel_printed: { defaultValue: ioBool() },
    imageprocessed: { defaultValue: ioBool() },
    imageprocessingrejected: { defaultValue: ioBool() },
    resolution: { defaultValue: _.random(70, 300) },
    imagedonotprint: { defaultValue: ioBool() },
    no_shipping: { defaultValue: ioBool() },
    material: {
      defaultValue: randomFrom([
        'standard-canvas',
        'self-adhesive-wallpaper',
        'standard-wallpaper',
        'premium-wallpaper',
        'premium-framed-print',
        'premium-poster',
      ]),
    },
    materialId: { defaultValue: _.random(1, 3) },
    stockId: { defaultValue: randomStockId() },
    categoryId: { defaultValue: '' },
    automated: { defaultValue: '' },
    uploaded: { defaultValue: '' },
    imgHash: { defaultValue: '' },
    nameLocalized: { defaultValue: '' },
    commission_agency: { defaultValue: '' },
    commission_agency_resale: { defaultValue: '' },
    commission_agency_amount: { defaultValue: '' },
    discountType: { defaultValue: '' },
    discountValue: { defaultValue: '' },
    measure_unit: { defaultValue: '' },
    packed: { defaultValue: '' },
    retouch_price: { defaultValue: '' },
    percent: { defaultValue: '' },
    product_description: { defaultValue: '' },
    displayWidth: { defaultValue: '' },
    displayHeight: { defaultValue: '' },
    imageWidth: { defaultValue: '' },
    imageHeight: { defaultValue: '' },
    posterHanger: { defaultValue: '' },
    pwinty_image_id: { defaultValue: '' },
    frame_color: { defaultValue: '' },
    pwinty_sku: { defaultValue: '' },
    orientation: { defaultValue: '' },
    designerPath: { defaultValue: '' },
    baseName: { defaultValue: '' },
    edge_fixed: { defaultValue: '' },
    width_mm: { defaultValue: '' },
    height_mm: { defaultValue: '' },
  });
  // console.log(`f`, f);
  let insertString = '';
  for (const key of Object.keys(f)) {
    const value = f[key];
    let dv;
    if (
      typeof value.defaultValue === 'string' ||
      typeof value.defaultValue === 'boolean'
    ) {
      dv = `'${value.defaultValue}'`;
    } else {
      dv = value.defaultValue;
    }
    insertString += `INSERT INTO public."order-rows_details" (rowid, fieldid, value, inserted, updated) VALUES (${id}, ${value.fieldid}, ${dv}, DEFAULT, NULL);\n`;
  }
  inserts.push(insertString);
 }
 saveFromTemplate(
  'templates/order-rows_details.sql',
  '../db/data/order-rows_details.sql',
  '{x}',
  inserts.join('\n'),
 );
@@ -5,7 +5,6 @@
  "requires": true,
  "packages": {
    "": {
      "name": "db_generator",
      "version": "1.0.0",
      "license": "ISC",
      "dependencies": {
@@ -1,27 +0,0 @@
 --
 -- PostgreSQL database dump
 --
 -- Dumped from database version 10.14
 -- Dumped by pg_dump version 10.14
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 SET idle_in_transaction_session_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', 'public', false);
 SET check_function_bodies = false;
 SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 --
 -- Data for Name: order-orders; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 {x}
 --
 -- PostgreSQL database dump complete
 --
@@ -1,30 +0,0 @@
 --
 -- PostgreSQL database dump
 --
 -- Dumped from database version 10.14
 -- Dumped by pg_dump version 10.14
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 SET idle_in_transaction_session_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);
 SET check_function_bodies = false;
 SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 --
 -- Data for Name: order-rows; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 {x}
 --
 -- PostgreSQL database dump complete
 --
@@ -1,27 +0,0 @@
 --
 -- PostgreSQL database dump
 --
 -- Dumped from database version 10.14
 -- Dumped by pg_dump version 10.14
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 SET idle_in_transaction_session_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);
 SET check_function_bodies = false;
 SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 --
 -- Data for Name: order-rows_details_tmp; Type: TABLE DATA; Schema: public; Owner: arwidthornstrom
 --
 {x}
 --
 -- PostgreSQL database dump complete
 --
@@ -35,18 +35,6 @@ export const dbConfig = {
          return 'i18n-texts';
        case 'i18n_texts_data':
          return 'i18n-texts_data';
        case 'order_fields':
          return 'order-fields';
        case 'order_orders':
          return 'order-orders';
        case 'order_orders_fields':
          return 'order-orders_fields';
        case 'order_row_fields':
          return 'order-row_fields';
        case 'order_rows':
          return 'order-rows';
        case 'order_rows_details':
          return 'order-rows_details';
        case 'product_currencies':
          return 'product-currencies';
        case 'product_fields':
@@ -1,14 +1,6 @@
 import { BaseSQLDataSource } from './BaseSQLDataSource';
-import { camelcase } from 'stringcase';
+import { Address, Order, OrderRow } from '../types/order-types';
-import {
+import { GeneralInput, Maybe } from '../types/types';
  Address,
  ContactInformation,
  Order,
  OrderRow,
 } from '../types/order-types';
 import { DateFilterInput, GeneralInput, Maybe } from '../types/types';
 import { convertToPossibleType } from './utils';
 import { getProductGroupStringFromString } from '../types/product-types';
 const MINUTE = 60;
 export class OrderAPI extends BaseSQLDataSource {
@@ -37,29 +29,6 @@ export class OrderAPI extends BaseSQLDataSource {
      : null;
  }
  getBillingInformation(row): ContactInformation {
    return {
      email: row.email,
      phone: row.phone,
      addressId: row.billingAddressId,
    };
  }
  getDeliveryInformation(row): ContactInformation {
    return {
      email: row.deliveryEmail,
      phone: row.deliveryPhone,
      addressId: row.deliveryAddressId,
    };
  }
  createOrderFromRow(row: any): Order {
    row.__resolveType = 'Order';
    row.billingInformation = this.getBillingInformation(row);
    row.deliveryInformation = this.getDeliveryInformation(row);
    return row;
  }
  async getOrdersTotal(input: Maybe<GeneralInput>): Promise<number> {
    const res = await this.getOrdersQuery(input)
      .clone()
@@ -74,9 +43,7 @@ export class OrderAPI extends BaseSQLDataSource {
    // TODO: handle offset
    query = query.orderBy('inserted', 'ASC');
-    return query
+    return query.cache(MINUTE);
      .cache(MINUTE)
      .then((rows) => rows.map((row) => this.createOrderFromRow(row)));
  }
  private getOrdersQuery(input: GeneralInput) {
@@ -93,13 +60,7 @@ export class OrderAPI extends BaseSQLDataSource {
  }
  async getOrderById(id: number): Promise<Order> {
-    return this.knex
+    return this.knex.select('*').from('orders').where('id', id).first();
      .select('*')
      .from('orders')
      .where('id', id)
      .first()
      .cache(MINUTE)
      .then((row) => this.createOrderFromRow(row));
  }
  async getOrderByExternalId(
@@ -117,111 +78,49 @@ export class OrderAPI extends BaseSQLDataSource {
      .where(column, value)
      .orderBy('id')
      .first()
-      .cache(MINUTE)
+      .cache(MINUTE);
      .then((row) => {
        return row ? this.createOrderFromRow(row) : null;
      });
  }
  async getOrderRowFieldMapping(): Promise<any> {
    // const fields = await this.knex.select('*').from('order-row_fields'); doesn't work becuase of string case...
    const fieldsRes = await this.cachedRaw('SELECT * from "order-row_fields"')
      .cache(MINUTE * 60)
      .then((data) => data.rows);
    return fieldsRes.reduce((obj, item) => {
      obj[item.fieldid] = item.name;
      return obj;
    }, {});
  }
  /**
   * Gets the row details
   */
  async getOrderRowDetailsForRowId(rowId: number): Promise<any> {
    const details = await this.knex
      .raw('SELECT * FROM "order-rows_details" WHERE rowid = ?', rowId)
      .then((data) => data.rows);
    // Skip empty order rows
    if (!details.length) {
      return null;
    }
    const fields = await this.getOrderRowFieldMapping();
    const orderRow = details.reduce((obj, item) => {
      const value = convertToPossibleType(item.value);
      obj[camelcase(fields[item.fieldid])] = value;
      return obj;
    }, {});
    if ('group' in orderRow) {
      orderRow['productGroup'] = orderRow['group'];
      orderRow['group'] = getProductGroupStringFromString(orderRow['group']);
    }
    return orderRow;
  }
  /**
   * Takes input from order-rows query and gets the row details
   */
  async getOrderRows(rows: any): Promise<Array<OrderRow>> {
    let orderRows = [];
    for (let i = 0; i < rows.length; i++) {
      const rowId = rows[i].rowid;
      const orderRow = await this.getOrderRowDetailsForRowId(rowId);
      if (!orderRow) {
        continue;
      }
      // take some data from order-rows results
      orderRow['id'] = rowId;
      orderRow['orderId'] = rows[i].orderid;
      orderRow['inserted'] = rows[i].inserted;
      orderRows.push(orderRow);
    }
    return orderRows;
  }
  async getOrderRowsByOrderId(orderId: number): Promise<Array<OrderRow>> {
-    const rows = await this.knex
+    return this.knex
-      .raw('SELECT * FROM "order-rows" WHERE orderid = ?', orderId)
+      .select('*')
-      .then((data) => data.rows);
+      .from('order_rows')
-
+      .where('order_id', orderId)
-    return this.getOrderRows(rows);
+      .then((rows) => this.createOrderRows(rows));
  }
  async getOrderRowsByDesignerId(
    designerId: number,
    input: Maybe<GeneralInput>,
  ): Promise<Array<OrderRow>> {
    const query = /* sql */ `
    SELECT orderdetails.*, "order-rows".orderid
      FROM "order-rows_details" orderdetails
      JOIN "order-rows" ON "order-rows".rowid = orderdetails.rowid
      WHERE orderdetails.fieldid = 105
      AND orderdetails.value = ?
      AND orderdetails.inserted >= ?
      AND orderdetails.inserted <= ?
      ORDER BY orderdetails.inserted ASC
      ${input?.pagination.limit ? `LIMIT ${input.pagination.limit}` : ''}
   `;
    const from = input?.filter?.dates?.from
      ? input.filter.dates.from
      : new Date('2000-01-01');
    const tomorrow = new Date();
    tomorrow.setDate(tomorrow.getDate() + 1);
    const to = input?.filter?.dates?.to ? input.filter?.dates.to : tomorrow; // Tomorrow
    const limit = input?.pagination.limit ?? 50000;
-    const rows = await this.knex
+    return this.knex
-      .raw(query, [designerId, this.getSQLDate(from), this.getSQLDate(to)])
+      .select('*')
-      .then((data) => data.rows);
+      .from('order_rows')
-    return this.getOrderRows(rows);
+      .where('designer_id', designerId)
      .whereBetween('inserted', [this.getSQLDate(from), this.getSQLDate(to)])
      .orderBy('inserted', 'desc')
      .limit(limit)
      .then((rows) => this.createOrderRows(rows));
  }
  createOrderRows(rows: Array<any>): Array<OrderRow> {
    return rows.map((row) => {
      return {
        ...row,
        data: {
          ...row.data,
          pwintySku: row.data.pwinty_sku ?? null,
          pwintyImageId: row.data.pwinty_image_id ?? null,
          frameColor: row.data.frame_color ?? null,
        },
      };
    });
  }
 }
@@ -4,13 +4,6 @@ import { OrderAPI } from '../datasources/order-api';
 import { OrdersResult } from '../types/order-types';
 import { GeneralInput } from '../types/types';
 const ContactInformation = {
  // (parent, args, ctx, info)
  async address({ addressId }, _args, { dataSources }) {
    return (<OrderAPI>dataSources.orderApi).getAddress(addressId);
  },
 };
 const Order = {
  async rows({ id }, _args, { dataSources }) {
    return (<OrderAPI>dataSources.orderApi).getOrderRowsByOrderId(id);
@@ -25,6 +18,12 @@ const Order = {
      locale,
    );
  },
  async billingAddress({ billingAddressId }, _args, { dataSources }) {
    return (<OrderAPI>dataSources.orderApi).getAddress(billingAddressId);
  },
  async deliveryAddress({ deliveryAddressId }, _args, { dataSources }) {
    return (<OrderAPI>dataSources.orderApi).getAddress(deliveryAddressId);
  },
 };
 const OrderRow = {
@@ -70,7 +69,6 @@ async function orderByExternalId(
 }
 export const orderTypeDefs = {
  ContactInformation,
  Order,
  OrderRow,
 };
@@ -146,12 +146,8 @@ type Address {
  city: String
  zipcode: String
  stateCountyOrRegion: String
 }
 type ContactInformation {
  email: String
  phone: String
  address: Address
 }
 type Order {
@@ -186,25 +182,12 @@ type Order {
  cancelsOrderId: Int
  cancelledByOrderId: Int
  orderlogId: Int
  resellerStore: String
  orderSum: Float
  pwintyId: Int
-  email: String
+  billingAddress: Address
-  phone: String
+  deliveryAddress: Address
  deliveryEmail: String
  deliveryPhone: String
  customerFirstname: String
  customerLastname: String
  customerEmail: String
  customerCellphone: String
  flyerIds: String
  billingInformation: ContactInformation
  deliveryInformation: ContactInformation
  billingAddressId: Int
  deliveryAddressId: Int
  """
  pwinty needs to be updated with market being a subtype
  """
  market: Market
  locale: Locale
  rows: [OrderRow]
@@ -212,51 +195,14 @@ type Order {
 type OrderRow {
  id: ID!
  artNo: String
  code: String
  commission: Int
  commissionAmount: Float
  commissionResale: Int
  designer: String
  designerId: Int
  designerPath: String
  discountType: String
  discountValue: Float
  displayHeight: Float
  displayWidth: Float
  edge: String
  frameColor: String
  framed: Int
  group: ProductGroup
  height: Int
  imagedonotprint: Int
  imageprocessed: Int
  imageprocessingrejected: Int
  inserted: DateTime
  material: String
  measureUnit: String
  mirrored: Int
  modifier: String
  name: String
  noShipping: Boolean
  order: Order
-  orderId: Int
+  data: OrderRowData
-  path: String
+}
-  price: Float
+
-  printId: Int
+type OrderRowData {
-  process: Boolean
+  frameColor: String
  productGroup: String
  productId: Int
  pwintyImageId: Int
  pwintySku: String
  resolution: Int
  status: String
  type: String
  vat: Float
  weight: Int
  width: Int
  x: Float
  y: Float
 }
 type Category {
@@ -17,12 +17,8 @@ export interface Address {
  city: string;
  zipcode: string;
  stateCountyOrRegion: string;
 }
 export interface ContactInformation {
  email: string;
  phone: string;
  addressId: number;
 }
 export interface Order {
@@ -71,57 +67,19 @@ export interface Order {
  flyerIds: string;
  market: string;
  locale: string;
  billingInformation: ContactInformation;
  deliveryInformation: ContactInformation;
  billingAddressId: number;
  deliveryAddressId: number;
 }
 export interface OrderRow {
  id: number;
  artNo: string;
  code: string;
  commission: number;
  commissionAmount: number;
  commissionResale: number;
  designer: string;
  designerId: number;
  designerPath: string;
  discountType: string;
  discountValue: number;
  displayHeight: number;
  displayWidth: number;
  edge: string;
  frameColor: string;
  framed: number;
  group: string;
  height: number;
  imagedonotprint: number;
  imageprocessed: number;
  imageprocessingrejected: number;
  inserted: Date;
  material: string;
  measureUnit: string;
  mirrored: number;
  modifier: string;
  name: string;
  noShipping: boolean;
  order: Order;
  orderId: number;
-  path: string;
+  designerId: number;
-  price: number;
+  data: OrderRowData;
-  printId: number;
+}
-  process: Boolean;
+
-  productGroup: string;
+export interface OrderRowData {
-  productId: number;
+  frameColor: string;
  pwintyImageId: number;
  pwintySku: string;
  resolution: number;
  status: string;
  type: string;
  vat: number;
  weight: number;
  width: number;
  x: number;
  y: number;
 }