gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

last corrections for payments

Browse source
This commit is contained in:
Kevin Adametz 2019-03-19 15:45:46 +01:00
parent 044a6bf253
commit 6db007fc82
53 changed files with 1514 additions and 1177 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/Mail/MailActivateUser.php
View file

@ -14,38 +14,32 @@ class MailActivateUser extends Mailable
protected $token;
public $subject;
public function __construct($token, User $user)
{
$this->token = $token;
$this->user = $user;
$this->subject = __('Change E-Mail');
$this->subject = __('email.change_e_mail');
}
public function build()
{
$salutation = __('Dear customer').",";
$salutation = __('email.salutation').",";
if($this->user->account){
if($this->user->account->salutation == "mr"){
$salutation = __('Dear Sir')." ".$this->user->account->last_name.",";
$salutation = __('email.dear_sir')." ".$this->user->account->first_name.",";
}else{
$salutation = __('Dear Mrs')." ".$this->user->account->last_name.",";
$salutation = __('email.dear_mrs')." ".$this->user->account->first_name.",";
}
}
return $this->view('emails.auth')->with([
'url' => route('user_update_email_confirm', $this->token),
'salutation' => $salutation,
'button' => __('Change E-Mail'),
'copy1line' => __('Dear Customer you will receive this e-mail because we have received a request to change your E-Mail Address for your account.'),
'copy2line' => __('Or copy this link into the address bar of your browser.'),
'copy3line' => __('For further questions we are happy to help you.'),
'greetings' => __('Best regards'),
'sender' => __('your mivita.care team'),
'button' => __('email.change_e_mail'),
'copy1line' => __('email.active_copy1line'),
'copy2line' => __('email.copy2line'),
'copy3line' => __('email.copy3line'),
'greetings' => __('email.greetings'),
'sender' => __('email.sender'),
]);
}
}

25
app/Mail/MailCheckout.php
View file

@ -26,42 +26,41 @@ class MailCheckout extends Mailable
$this->shopping_order = $shopping_order;
$this->shopping_payment = $shopping_payment;
$this->subject = __('Deine Bestellung auf mivita.care');
$this->subject = __('email.checkout_subject')." mivita.care";
if($shopping_order->user_shop){
$this->subject = __('Deine Bestellung auf '.$shopping_order->user_shop->slug.'.mivita.care');
$this->subject = __('email.checkout_subject')." ".$shopping_order->user_shop->slug.'.mivita.care';
}
}
public function build()
{
$salutation = __('Dear customer').",";
$salutation = __('email.salutation').",";
if($this->shopping_order->shopping_user){
$salutation = __('Hallo')." ".$this->shopping_order->shopping_user->billing_firstname." ".$this->shopping_order->shopping_user->billing_lastname.",";
$salutation = __('email.hello')." ".$this->shopping_order->shopping_user->billing_firstname.",";
//make Adresse
}
if($this->txaction == 'paid'){
return $this->view('emails.checkout')->with([
'salutation' => $salutation,
'copy1line' => __('vielen Dank für Deine Bestellung bei mivita.care.<br><br>Nachfolgend haben wir zur Kontrolle Deine Bestellung noch einmal aufgelistet.'),
'copy1line' => __('email.checkout_copy1line'),
'shopping_order' => $this->shopping_order,
'shopping_payment' => $this->shopping_payment,
'copy3line' => __('Bei Fragen sind wir jederzeit für Dich da.'),
'greetings' => __('Best regards'),
'sender' => __('your mivita.care team'),
'copy3line' => __('email.checkout_copy3line'),
'greetings' => __('email.greetings'),
'sender' => __('email.sender'),
]);
}else{
return $this->view('emails.checkout_status')->with([
'salutation' => $salutation,
'copy1line' => "Status zu Deiner Bestellung bei mivita.care",
'copy1line' => __('email.status_copy1line'),
'txactionn' => $this->txaction,
'shopping_order' => $this->shopping_order,
'shopping_payment' => $this->shopping_payment,
'copy3line' => __('Bei Fragen sind wir jederzeit für Dich da.'),
'greetings' => __('Best regards'),
'sender' => __('your mivita.care team'),
'copy3line' => __('email.checkout_copy3line'),
'greetings' => __('email.greetings'),
'sender' => __('email.sender'),
]);
}

19
app/Mail/MailContact.php
View file

@ -21,30 +21,27 @@ class MailContact extends Mailable
{
$this->data = $data;
$this->user_shop = Util::getUserShop();
$this->subject = __('Anfrage von mivita.care');
$this->subject = __('email.request_from').' mivita.care';
if($this->user_shop){
$this->subject = __('Anfrage von '.$this->user_shop->slug.'.mivita.care');
$this->subject = __('email.request_from')." ".$this->user_shop->slug.'.mivita.care';
}
}
public function build()
{
$salutation = __('Dear customer').",";
$salutation = __('email.salutation');
$copy1line = __('Deine Anfrage von mivita.care');
$copy1line = __('email.your_request_from')." mivita.care";
if($this->user_shop){
$copy1line = __('Deine Anfrage von '.$this->user_shop->slug.'.mivita.care');
$copy1line = __('email.your_request_from')." ".$this->user_shop->slug.'.mivita.care';
}
return $this->view('emails.contact')->with([
'salutation' => $salutation,
'copy1line' => $copy1line,
'data' => $this->data,
'copy3line' => __('For further questions we are happy to help you.'),
'greetings' => __('Best regards'),
'sender' => __('your mivita.care team'),
'copy3line' => __('email.copy3line'),
'greetings' => __('email.greetings'),
'sender' => __('email.sender'),
]);
}
}

30
app/Mail/MailResetPassword.php
View file

@ -20,31 +20,31 @@ class MailResetPassword extends Mailable
$this->token = $token;
$this->user = $user;
$this->subject = __('Reset Password');
$this->subject = __('email.reset_passwort');
}
public function build()
{
$salutation = __('Dear customer').",";
$salutation = __('email.salutation').",";
if($this->user->account){
if($this->user->account->salutation == "mr"){
$salutation = __('Dear Sir')." ".$this->user->account->last_name.",";
}else{
$salutation = __('Dear Mrs')." ".$this->user->account->last_name.",";
}
}
if($this->user->account->salutation == "mr"){
$salutation = __('email.dear_sir')." ".$this->user->account->first_name.",";
}else{
$salutation = __('email.dear_mrs')." ".$this->user->account->first_name.",";
}
}
return $this->view('emails.auth')->with([
'url' => route('password.reset', $this->token),
'salutation' => $salutation,
'button' => __('Reset Password'),
'copy1line' => __('Dear Customer you will receive this e-mail because we have received a request to reset the password for your account.'),
'copy2line' => __('Or copy this link into the address bar of your browser.'),
'copy3line' => __('For further questions we are happy to help you.'),
'greetings' => __('Best regards'),
'sender' => __('your mivita.care team'),
'button' => __('email.reset_passwort'),
'copy1line' => __('email.reset_pass_copy1line'),
'copy2line' => __('email.copy2line'),
'copy3line' => __('email.copy3line'),
'greetings' => __('email.greetings'),
'sender' => __('email.sender'),
]);
}
}
}

35
app/Mail/MailVerifyAccount.php
View file

@ -17,36 +17,33 @@ class MailVerifyAccount extends Mailable
public function __construct($confirmation_code, User $user)
{
$this->confirmation_code = $confirmation_code;
$this->user = $user;
$this->subject = __('Verify Your Email Address');
$this->subject = __('email.email_verify');
}
public function build()
{
$salutation = __('Dear customer').",";
if($this->user->account){
if($this->user->account->salutation == "mr"){
$salutation = __('Dear Sir')." ".$this->user->account->last_name.",";
}else{
$salutation = __('Dear Mrs')." ".$this->user->account->last_name.",";
}
}
$salutation = __('email.salutation').",";
if($this->user->account){
if($this->user->account->salutation == "mr"){
$salutation = __('email.dear_sir')." ".$this->user->account->first_name.",";
}else{
$salutation = __('email.dear_mrs')." ".$this->user->account->first_name.",";
}
}
return $this->view('emails.auth')->with([
'url' => route('register_verify', $this->confirmation_code),
'salutation' => $salutation,
'button' => __('Verify Your Email Address'),
'copy1line' => __('Thank you for creating an account with the JACKON Infomanager. Please follow the link below to confirm your email address.'),
'copy2line' => __('Or copy this link into the address bar of your browser.'),
'copy3line' => __('For further questions we are happy to help you.'),
'greetings' => __('Best regards'),
'sender' => __('your mivita.care team'),
'button' => __('email.email_verify'),
'copy1line' => __('email.email_verify_copy1line'),
'copy2line' => __('email.active_copy2line'),
'copy3line' => __('email.active_copy3line'),
'greetings' => __('email.greetings'),
'sender' => __('email.sender'),
]);
}
}
}

25
app/Mail/MailVerifyContact.php
View file

@ -17,36 +17,31 @@ class MailVerifyContact extends Mailable
public function __construct($confirmation_code, User $user)
{
$this->confirmation_code = $confirmation_code;
$this->user = $user;
$this->subject = __('Verify your Data and E-Mail Address');
$this->subject = __('email.verify_e_mail');
}
public function build()
{
$salutation = __('Dear customer').",";
$salutation = __('email.salutation').",";
if($this->user->account){
if($this->user->account->salutation == "mr"){
$salutation = __('Dear Sir')." ".$this->user->account->last_name.",";
$salutation = __('email.dear_sir')." ".$this->user->account->first_name.",";
}else{
$salutation = __('Dear Mrs')." ".$this->user->account->last_name.",";
$salutation = __('email.dear_mrs')." ".$this->user->account->first_name.",";
}
}
return $this->view('emails.auth')->with([
'url' => route('register_verify', $this->confirmation_code),
'salutation' => $salutation,
'button' => __('Verify your Data and E-Mail Address'),
'copy1line' => __('We have data about you stored in our JACKON Infomanager. Please follow the link below to verify your email address.You can also change or delete your data.'),
'copy2line' => __('Or copy this link into the address bar of your browser.'),
'copy3line' => __('For further questions we are happy to help you.'),
'greetings' => __('Best regards'),
'sender' => __('your mivita.care team'),
'button' => __('email.verify_e_mail'),
'copy1line' => __('email.verify_copy1line'),
'copy2line' => __('email.copy2line'),
'copy3line' => __('email.copy3line'),
'greetings' => __('email.greetings'),
'sender' => __('email.sender'),
]);
}
}