Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d444b85 authored by Ronak Patel's avatar Ronak Patel
Browse files

Merge branch 'dev/account-delete-changes' into 'main' 

added subscription in condition to delete account

See merge request !45
parents 10e44f04 58645f45

appinfo/info.xml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
    <description><![CDATA[in /e/OS cloud, nextcloud accounts are linked to mail accounts. This app ensures both are coordinated: it sets the e-mail address, quota and storage of the user upon creation.

    It also completes the account deletion by cleaning other parts of the /e/OS cloud setup to ensure no more data is retained when a user requests an account deletion.

    This app uses the UserDeletedEvent to invoke scripts in the docker-welcome container of /e/OS cloud setup]]></description>

    <version>2.3.4</version>

    <version>2.4.0</version>

    <licence>agpl</licence>

    <author mail="dev@e.email" homepage="https://gitlab.e.foundation/">Akhil Potukuchi</author>

    <namespace>EcloudAccounts</namespace>

appinfo/routes.php

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ return ['routes' => [ 
	['name' => 'shop_account#set_shop_email_post_delete', 'url' => '/shop-accounts/set_shop_email_post_delete', 'verb' => 'POST' ],

	['name' => 'shop_account#set_shop_delete_preference', 'url' => '/shop-accounts/set_shop_delete_preference', 'verb' => 'POST' ],

	['name' => 'shop_account#get_order_info', 'url' => '/shop-accounts/order_info', 'verb' => 'GET'],

	['name' => 'shop_account#get_subscription_info', 'url' => '/shop-accounts/subscription_info', 'verb' => 'GET'],

	['name' => 'shop_account#get_shop_user', 'url' => '/shop-accounts/user', 'verb' => 'GET'],

	['name' => 'shop_account#check_shop_email_post_delete', 'url' => '/shop-accounts/check_shop_email_post_delete', 'verb' => 'GET'],

	[

l10n/de.js

+7 −3
Original line number Diff line number Diff line
@@ -3,8 +3,9 @@ OC.L10N.register( 
	{

		"Email Address": "E-Mail Adresse",

		"Options": "Optionen",

		"We are going to proceed with your cloud account suppression. Check the box below if you also want to delete the associated shop account.": "Wir werden mit der Löschung Ihres Cloud-Kontos fortfahren. Markieren Sie das Kästchen unten, wenn Sie auch das zugehörige Shop-Konto löschen möchten.",

		"For your information you have %d order(s) in <a class='text-color-active' href='%s'>your account</a>.": "Zu Ihrer Information: Sie haben %d Auftrag(e) in <a class='text-color-active' href='%s'>Ihrem Konto</a>.",

		"We are going to proceed with your cloud account suppression.": "Wir werden mit der Löschung Ihres Cloud-Kontos fortfahren.",

		"Check the box below if you also want to delete the associated shop account.": "Markieren Sie das Kästchen unten, wenn Sie auch das zugehörige Shop-Konto löschen möchten.",

		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Zu Ihrer Information: Sie haben %d Auftrag(e) in <a class='text-color-active' href='%s' target='_blank'>Ihrem Konto</a>.",

		"I also want to delete my shop account": "Ich möchte auch mein Shop-Konto löschen",

		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ": "Wenn Sie Ihr Shop-Konto behalten möchten, bestätigen oder ändern Sie bitte die E-Mail-Adresse unten. Diese E-Mail-Adresse wird Ihr neues Login für den Shop sein. ",

		"Error while setting shop delete preference": "Fehler beim Einstellen der Shop-Löschpräferenz",
@@ -33,6 +34,9 @@ OC.L10N.register( 
		"Experimental": "Experimentelle",

		"Title is mandatory.": "Der Titel ist obligatorisch.",

		"Description is mandatory.": "Die Beschreibung ist obligatorisch.",

		"Here is the list of currently available beta features:": "Hier ist die Liste der derzeit verfügbaren Beta-Funktionen:"

		"Here is the list of currently available beta features:": "Hier ist die Liste der derzeit verfügbaren Beta-Funktionen:",

		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Für dieses Konto ist ein Abonnement aktiv. Bitte kündigen Sie es oder lassen Sie es auslaufen, bevor Sie Ihr Konto löschen.",

		"Loading...": "Laden...",

		"Temporary error contacting murena.com; please try again later!": "Vorübergehender Fehler bei der Kontaktaufnahme mit murena.com; bitte versuchen Sie es später noch einmal!"

	},

	"nplurals=2; plural=(n != 1);");

l10n/de.json

+7 −3
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ 
	"translations": {

		"Email Address": "E-Mail Adresse",

		"Options": "Optionen",

		"We are going to proceed with your cloud account suppression. Check the box below if you also want to delete the associated shop account.": "Wir werden mit der Löschung Ihres Cloud-Kontos fortfahren. Markieren Sie das Kästchen unten, wenn Sie auch das zugehörige Shop-Konto löschen möchten.",

		"For your information you have %d order(s) in <a class='text-color-active' href='%s'>your account</a>.": "Zu Ihrer Information: Sie haben %d Auftrag(e) in <a class='text-color-active' href='%s'>Ihrem Konto</a>.",

		"We are going to proceed with your cloud account suppression.": "Wir werden mit der Löschung Ihres Cloud-Kontos fortfahren.",

		"Check the box below if you also want to delete the associated shop account.": "Markieren Sie das Kästchen unten, wenn Sie auch das zugehörige Shop-Konto löschen möchten.",

		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Zu Ihrer Information: Sie haben %d Auftrag(e) in <a class='text-color-active' href='%s' target='_blank'>Ihrem Konto</a>.",

		"I also want to delete my shop account": "Ich möchte auch mein Shop-Konto löschen",

		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ": "Wenn Sie Ihr Shop-Konto behalten möchten, bestätigen oder ändern Sie bitte die E-Mail-Adresse unten. Diese E-Mail-Adresse wird Ihr neues Login für den Shop sein. ",

		"Error while setting shop delete preference": "Fehler beim Einstellen der Shop-Löschpräferenz",
@@ -32,7 +33,10 @@ 
		"Experimental": "Experimentelle",

		"Title is mandatory.": "Der Titel ist obligatorisch.",

		"Description is mandatory.": "Die Beschreibung ist obligatorisch.",

		"Here is the list of currently available beta features:": "Hier ist die Liste der derzeit verfügbaren Beta-Funktionen:"

		"Here is the list of currently available beta features:": "Hier ist die Liste der derzeit verfügbaren Beta-Funktionen:",

		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Für dieses Konto ist ein Abonnement aktiv. Bitte kündigen Sie es oder lassen Sie es auslaufen, bevor Sie Ihr Konto löschen.",

		"Loading...": "Laden...",

		"Temporary error contacting murena.com; please try again later!": "Vorübergehender Fehler bei der Kontaktaufnahme mit murena.com; bitte versuchen Sie es später noch einmal!"

	},

	"pluralForm": "nplurals=2; plural=(n != 1);"

}

l10n/en.js

+7 −3
Original line number Diff line number Diff line
@@ -3,8 +3,9 @@ OC.L10N.register( 
	{

		"Email Address": "Email Address",

		"Options": "Options",

		"We are going to proceed with your cloud account suppression. Check the box below if you also want to delete the associated shop account.": "We are going to proceed with your cloud account suppression. Check the box below if you also want to delete the associated shop account.",

		"For your information you have %d order(s) in <a class='text-color-active' href='%s'>your account</a>.": "For your information you have %d order(s) in <a class='text-color-active' href='%s'>your account</a>.",

		"We are going to proceed with your cloud account suppression.": "We are going to proceed with your cloud account suppression.",

		"Check the box below if you also want to delete the associated shop account.": "Check the box below if you also want to delete the associated shop account.",

		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.",

		"I also want to delete my shop account": "I also want to delete my shop account",

		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ": "If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ",

		"Error while setting shop delete preference": "Error while setting shop delete preference",
@@ -33,6 +34,9 @@ OC.L10N.register( 
		"Experimental": "Experimental",

		"Title is mandatory.": "Title is mandatory.",

		"Description is mandatory.": "Description is mandatory.",

		"Here is the list of currently available beta features:": "Here is the list of currently available beta features:"

		"Here is the list of currently available beta features:": "Here is the list of currently available beta features:",

		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "A subscription is active in this account. Please cancel it or let it expire before deleting your account.",

		"Loading...": "Loading...",

		"Temporary error contacting murena.com; please try again later!": "Temporary error contacting murena.com; please try again later!"

	},

	"nplurals=2; plural=(n != 1);");