From 261f80ee4f8e128ba5cfeb0d308adb5a865e2375 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Mon, 21 Oct 2019 16:14:28 +0200
Subject: [PATCH] Add mailing configuration

---
 schema.graphql                                 |  2 ++
 .../SiteSettingsMailing.tsx                    | 18 ++++++++++--------
 .../SiteSettingsPage/SiteSettingsPage.tsx      | 14 ++++++++++----
 src/siteSettings/queries.ts                    |  3 +++
 src/siteSettings/types/AuthorizationKeyAdd.ts  |  3 +++
 .../types/AuthorizationKeyDelete.ts            |  3 +++
 src/siteSettings/types/ShopFragment.ts         |  3 +++
 src/siteSettings/types/ShopSettingsUpdate.ts   |  3 +++
 src/siteSettings/types/SiteSettings.ts         |  3 +++
 src/siteSettings/views/index.tsx               |  4 ++++
 .../stories/siteSettings/SiteSettingsPage.tsx  |  9 ++++++++-
 src/types/globalTypes.ts                       |  4 ++++
 12 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/schema.graphql b/schema.graphql
index a845ef15b..a2c53e4fc 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -3767,6 +3767,7 @@ type Shop {
   defaultDigitalMaxDownloads: Int
   defaultDigitalUrlValidDays: Int
   companyAddress: Address
+  customerSetPasswordUrl: String
 }
 
 type ShopAddressUpdate {
@@ -3816,6 +3817,7 @@ input ShopSettingsInput {
   defaultDigitalUrlValidDays: Int
   defaultMailSenderName: String
   defaultMailSenderAddress: String
+  customerSetPasswordUrl: String
 }
 
 type ShopSettingsTranslate {
diff --git a/src/siteSettings/components/SiteSettingsMailing/SiteSettingsMailing.tsx b/src/siteSettings/components/SiteSettingsMailing/SiteSettingsMailing.tsx
index 3a619ed58..748c35b6d 100644
--- a/src/siteSettings/components/SiteSettingsMailing/SiteSettingsMailing.tsx
+++ b/src/siteSettings/components/SiteSettingsMailing/SiteSettingsMailing.tsx
@@ -15,12 +15,14 @@ import { FormErrors } from "@saleor/types";
 export interface SiteSettingsMailingFormData {
   defaultMailSenderName: string;
   defaultMailSenderAddress: string;
-  passwordResetUrl: string;
+  customerSetPasswordUrl: string;
 }
 interface SiteSettingsMailingProps {
   data: SiteSettingsMailingFormData;
   errors: FormErrors<
-    "defaultMailSenderAddress" | "defaultMailSenderName" | "passwordResetUrl"
+    | "defaultMailSenderAddress"
+    | "defaultMailSenderName"
+    | "customerSetPasswordUrl"
   >;
   disabled: boolean;
   onChange: (event: React.ChangeEvent<any>) => void;
@@ -82,7 +84,7 @@ const SiteSettingsMailing: React.FC<SiteSettingsMailingProps> = props => {
           disabled={disabled}
           error={!!errors.defaultMailSenderName}
           fullWidth
-          name="defaultMailSenderAddress"
+          name="defaultMailSenderName"
           label={intl.formatMessage({
             defaultMessage: "Mailing email sender"
           })}
@@ -93,7 +95,7 @@ const SiteSettingsMailing: React.FC<SiteSettingsMailingProps> = props => {
               description: "email sender"
             })
           }
-          value={data.defaultMailSenderAddress}
+          value={data.defaultMailSenderName}
           onChange={onChange}
         />
         <FormSpacer />
@@ -101,20 +103,20 @@ const SiteSettingsMailing: React.FC<SiteSettingsMailingProps> = props => {
         <FormSpacer />
         <TextField
           disabled={disabled}
-          error={!!errors.passwordResetUrl}
+          error={!!errors.customerSetPasswordUrl}
           fullWidth
-          name="passwordResetUrl"
+          name="customerSetPasswordUrl"
           label={intl.formatMessage({
             defaultMessage: "URL address"
           })}
           helperText={
-            errors.passwordResetUrl ||
+            errors.customerSetPasswordUrl ||
             intl.formatMessage({
               defaultMessage:
                 "This URL will be used as a main URL for password resets. It will be sent via email."
             })
           }
-          value={data.passwordResetUrl}
+          value={data.customerSetPasswordUrl}
           onChange={onChange}
         />
       </CardContent>
diff --git a/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx b/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx
index 4f7d77524..cddd97e51 100644
--- a/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx
+++ b/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx
@@ -86,19 +86,25 @@ const SiteSettingsPage: React.FC<SiteSettingsPageProps> = props => {
     maybe(() => shop.companyAddress.country.code, "")
   );
 
-  const initialForm: SiteSettingsPageFormData = {
+  const initialFormAddress: SiteSettingsPageAddressFormData = {
     city: maybe(() => shop.companyAddress.city, ""),
     companyName: maybe(() => shop.companyAddress.companyName, ""),
     country: maybe(() => shop.companyAddress.country.code, ""),
     countryArea: maybe(() => shop.companyAddress.countryArea, ""),
-    description: maybe(() => shop.description, ""),
-    domain: maybe(() => shop.domain.host, ""),
-    name: maybe(() => shop.name, ""),
     phone: maybe(() => shop.companyAddress.phone, ""),
     postalCode: maybe(() => shop.companyAddress.postalCode, ""),
     streetAddress1: maybe(() => shop.companyAddress.streetAddress1, ""),
     streetAddress2: maybe(() => shop.companyAddress.streetAddress2, "")
   };
+  const initialForm: SiteSettingsPageFormData = {
+    ...initialFormAddress,
+    customerSetPasswordUrl: maybe(() => shop.customerSetPasswordUrl, ""),
+    defaultMailSenderAddress: maybe(() => shop.defaultMailSenderAddress, ""),
+    defaultMailSenderName: maybe(() => shop.defaultMailSenderName, ""),
+    description: maybe(() => shop.description, ""),
+    domain: maybe(() => shop.domain.host, ""),
+    name: maybe(() => shop.name, "")
+  };
 
   return (
     <Form
diff --git a/src/siteSettings/queries.ts b/src/siteSettings/queries.ts
index b6a57c61a..d4e01c203 100644
--- a/src/siteSettings/queries.ts
+++ b/src/siteSettings/queries.ts
@@ -17,6 +17,9 @@ export const shopFragment = gql`
       code
       country
     }
+    customerSetPasswordUrl
+    defaultMailSenderAddress
+    defaultMailSenderName
     description
     domain {
       host
diff --git a/src/siteSettings/types/AuthorizationKeyAdd.ts b/src/siteSettings/types/AuthorizationKeyAdd.ts
index a326a9cca..bc8205925 100644
--- a/src/siteSettings/types/AuthorizationKeyAdd.ts
+++ b/src/siteSettings/types/AuthorizationKeyAdd.ts
@@ -58,6 +58,9 @@ export interface AuthorizationKeyAdd_authorizationKeyAdd_shop {
   authorizationKeys: (AuthorizationKeyAdd_authorizationKeyAdd_shop_authorizationKeys | null)[];
   companyAddress: AuthorizationKeyAdd_authorizationKeyAdd_shop_companyAddress | null;
   countries: (AuthorizationKeyAdd_authorizationKeyAdd_shop_countries | null)[];
+  customerSetPasswordUrl: string | null;
+  defaultMailSenderAddress: string | null;
+  defaultMailSenderName: string | null;
   description: string | null;
   domain: AuthorizationKeyAdd_authorizationKeyAdd_shop_domain;
   name: string;
diff --git a/src/siteSettings/types/AuthorizationKeyDelete.ts b/src/siteSettings/types/AuthorizationKeyDelete.ts
index 024e7f599..2e6451869 100644
--- a/src/siteSettings/types/AuthorizationKeyDelete.ts
+++ b/src/siteSettings/types/AuthorizationKeyDelete.ts
@@ -58,6 +58,9 @@ export interface AuthorizationKeyDelete_authorizationKeyDelete_shop {
   authorizationKeys: (AuthorizationKeyDelete_authorizationKeyDelete_shop_authorizationKeys | null)[];
   companyAddress: AuthorizationKeyDelete_authorizationKeyDelete_shop_companyAddress | null;
   countries: (AuthorizationKeyDelete_authorizationKeyDelete_shop_countries | null)[];
+  customerSetPasswordUrl: string | null;
+  defaultMailSenderAddress: string | null;
+  defaultMailSenderName: string | null;
   description: string | null;
   domain: AuthorizationKeyDelete_authorizationKeyDelete_shop_domain;
   name: string;
diff --git a/src/siteSettings/types/ShopFragment.ts b/src/siteSettings/types/ShopFragment.ts
index d27566ab8..aaf4326c9 100644
--- a/src/siteSettings/types/ShopFragment.ts
+++ b/src/siteSettings/types/ShopFragment.ts
@@ -52,6 +52,9 @@ export interface ShopFragment {
   authorizationKeys: (ShopFragment_authorizationKeys | null)[];
   companyAddress: ShopFragment_companyAddress | null;
   countries: (ShopFragment_countries | null)[];
+  customerSetPasswordUrl: string | null;
+  defaultMailSenderAddress: string | null;
+  defaultMailSenderName: string | null;
   description: string | null;
   domain: ShopFragment_domain;
   name: string;
diff --git a/src/siteSettings/types/ShopSettingsUpdate.ts b/src/siteSettings/types/ShopSettingsUpdate.ts
index 2fa80ac0d..f583dc589 100644
--- a/src/siteSettings/types/ShopSettingsUpdate.ts
+++ b/src/siteSettings/types/ShopSettingsUpdate.ts
@@ -58,6 +58,9 @@ export interface ShopSettingsUpdate_shopSettingsUpdate_shop {
   authorizationKeys: (ShopSettingsUpdate_shopSettingsUpdate_shop_authorizationKeys | null)[];
   companyAddress: ShopSettingsUpdate_shopSettingsUpdate_shop_companyAddress | null;
   countries: (ShopSettingsUpdate_shopSettingsUpdate_shop_countries | null)[];
+  customerSetPasswordUrl: string | null;
+  defaultMailSenderAddress: string | null;
+  defaultMailSenderName: string | null;
   description: string | null;
   domain: ShopSettingsUpdate_shopSettingsUpdate_shop_domain;
   name: string;
diff --git a/src/siteSettings/types/SiteSettings.ts b/src/siteSettings/types/SiteSettings.ts
index ee049f738..6b0064451 100644
--- a/src/siteSettings/types/SiteSettings.ts
+++ b/src/siteSettings/types/SiteSettings.ts
@@ -52,6 +52,9 @@ export interface SiteSettings_shop {
   authorizationKeys: (SiteSettings_shop_authorizationKeys | null)[];
   companyAddress: SiteSettings_shop_companyAddress | null;
   countries: (SiteSettings_shop_countries | null)[];
+  customerSetPasswordUrl: string | null;
+  defaultMailSenderAddress: string | null;
+  defaultMailSenderName: string | null;
   description: string | null;
   domain: SiteSettings_shop_domain;
   name: string;
diff --git a/src/siteSettings/views/index.tsx b/src/siteSettings/views/index.tsx
index 77758cb18..ac57bf824 100644
--- a/src/siteSettings/views/index.tsx
+++ b/src/siteSettings/views/index.tsx
@@ -142,6 +142,10 @@ export const SiteSettings: React.StatelessComponent<SiteSettingsProps> = ({
                             name: data.name
                           },
                           shopSettingsInput: {
+                            customerSetPasswordUrl: data.customerSetPasswordUrl,
+                            defaultMailSenderAddress:
+                              data.defaultMailSenderAddress,
+                            defaultMailSenderName: data.defaultMailSenderName,
                             description: data.description
                           }
                         }
diff --git a/src/storybook/stories/siteSettings/SiteSettingsPage.tsx b/src/storybook/stories/siteSettings/SiteSettingsPage.tsx
index 66c3e62ee..51925caa0 100644
--- a/src/storybook/stories/siteSettings/SiteSettingsPage.tsx
+++ b/src/storybook/stories/siteSettings/SiteSettingsPage.tsx
@@ -29,6 +29,13 @@ storiesOf("Views / Site settings / Page", module)
   .add("form errors", () => (
     <SiteSettingsPage
       {...props}
-      errors={["description", "domain", "name"].map(field => formError(field))}
+      errors={[
+        "description",
+        "domain",
+        "name",
+        "defaultMailSenderAddress",
+        "defaultMailSenderName",
+        "customerSetPasswordUrl"
+      ].map(field => formError(field))}
     />
   ));
diff --git a/src/types/globalTypes.ts b/src/types/globalTypes.ts
index 029e1ff9d..e282a14af 100644
--- a/src/types/globalTypes.ts
+++ b/src/types/globalTypes.ts
@@ -299,6 +299,7 @@ export enum WebhookEventTypeEnum {
   CUSTOMER_CREATED = "CUSTOMER_CREATED",
   ORDER_CANCELLED = "ORDER_CANCELLED",
   ORDER_CREATED = "ORDER_CREATED",
+  ORDER_FULFILLED = "ORDER_FULFILLED",
   ORDER_FULLY_PAID = "ORDER_FULLY_PAID",
   ORDER_UPDATED = "ORDER_UPDATED",
   PRODUCT_CREATED = "PRODUCT_CREATED",
@@ -748,6 +749,9 @@ export interface ShopSettingsInput {
   automaticFulfillmentDigitalProducts?: boolean | null;
   defaultDigitalMaxDownloads?: number | null;
   defaultDigitalUrlValidDays?: number | null;
+  defaultMailSenderName?: string | null;
+  defaultMailSenderAddress?: string | null;
+  customerSetPasswordUrl?: string | null;
 }
 
 export interface SiteDomainInput {