Skip to content

Commit cf4db39

Browse files
Merge pull request #2 from sendinblue/feature_new-branding
new branding changes
2 parents 0d33aa8 + a7922e9 commit cf4db39

17 files changed

+172
-156
lines changed

Controller/Adminhtml/index/Ajax.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public function ajaxSmtpStatus()
235235
$this->getResponse()->setBody($msgVal);
236236
} else {
237237
$model->updateDbData('api_smtp_status', 0);
238-
$msgVal = __('Your SMTP account is not activated and therefore you can\'t use SendinBlue SMTP. For more informations, please contact our support to: contact@sendinblue.com');
238+
$msgVal = __('Your SMTP account is not activated and therefore you can\'t use Sendinblue SMTP. For more informations, please contact our support to: contact@sendinblue.com');
239239
$this->getResponse()->setHeader('Content-type', 'application/text');
240240
$this->getResponse()->setBody($msgVal);
241241
}
@@ -460,7 +460,9 @@ public function loadContact()
460460
} else {
461461
$imgSendinBlue = '<img src="'.$blockObj->getViewFileUrl('Sendinblue_Sendinblue::images/disabled.gif').'" id="ajax_contact_status_'.$i.'" title="'.$title2.'" >';
462462
}
463-
463+
$imgMagento = str_replace('_view','Magento/backend', $imgMagento);
464+
$imgSendinBlue = str_replace('_view','Magento/backend', $imgSendinBlue);
465+
$imgSms = str_replace('_view','Magento/backend', $imgSms);
464466
$message .= '<tr class="even pointer"><td class="a-left">'.$email.'</td><td class="a-left">'.$client.'</td><td class="a-left">'.$phone.'</td><td class="a-left">'.$imgMagento.'</td>
465467
<td class="a-left"><a status="'.$showStatus.'" email="'.$email.'" class="ajax_contacts_href" href="javascript:void(0)">
466468
'.$imgSendinBlue.'</a></td><td class="a-left last">

Controller/Adminhtml/index/Post.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function execute()
9292
$relayData = $model->getDbData('relay_data_status');
9393
if (!empty($userEmail) && $post['smtpservices'] == 1) {
9494
if ($relayData == 'enabled') {
95-
$title = __('[SendinBlue SMTP] test email');
95+
$title = __('[Sendinblue SMTP] test email');
9696
$tempName = 'sendinsmtp_conf';
9797
$respMail = $model->smtpSendMail($userEmail, $title, $tempName, $paramVal = '');
9898
if ($respMail['status'] == 1) {
@@ -105,7 +105,7 @@ public function execute()
105105
return;
106106
}
107107
} else {
108-
$this->messageManager->addError(__('Your SMTP account is not activated and therefore you can\'t use SendinBlue SMTP. For more informations, Please contact our support to: contact@sendinblue.com'));
108+
$this->messageManager->addError(__('Your SMTP account is not activated and therefore you can\'t use Sendinblue SMTP. For more informations, Please contact our support to: contact@sendinblue.com'));
109109
$this->_redirect('sendinblue/sib/index');
110110
return;
111111
}

Model/Mmailin.php

+25-25
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public function getCampaignsV2($data)
209209
@options data {String} reply_to: The reply to email in the campaign emails [Optional]
210210
@options data {String} to_field: This is to personalize the «To» Field. If you want to
211211
include the first name and last name of your recipient, add [PRENOM] [NOM] To use the contact
212-
attributes here, these should already exist in SendinBlue account [Optional]
212+
attributes here, these should already exist in Sendinblue account [Optional]
213213
@options data {Array} exclude_list: These are the lists which must be excluded from the campaign [Optional]
214214
@options data {String} attachment_url: Provide the absolute url of the attachment [Optional]
215215
@options data {Integer} inline_image: Status of inline image. Possible values = 0 (default)
@@ -254,7 +254,7 @@ public function createCampaign($data)
254254
@options data {String} reply_to: The reply to email in the campaign emails [Optional]
255255
@options data {String} to_field: This is to personalize the «To» Field. If you want to
256256
include the first name and last name of your recipient, add [PRENOM] [NOM]. To use the
257-
contact attributes here, these should already exist in SendinBlue account [Optional]
257+
contact attributes here, these should already exist in Sendinblue account [Optional]
258258
@options data {Array} exclude_list: These are the lists which must be excluded from the
259259
campaign [Optional]
260260
@options data {String} attachment_url: Provide the absolute url of the attachment [Optional]
@@ -393,7 +393,7 @@ public function updateCampaignStatus($data)
393393
@options data {String} reply_to: The reply to email in the campaign emails [Optional]
394394
@options data {String} to_field: This is to personalize the «To» Field. If you want to include
395395
the first name and last name of your recipient, add [PRENOM] [NOM]. To use the contact attributes
396-
here, these should already exist in SendinBlue account [Optional]
396+
here, these should already exist in Sendinblue account [Optional]
397397
@options data {Array} exclude_list: These are the lists which must be excluded from the campaign
398398
[Optional]
399399
@options data {Integer} recurring: Type of trigger campaign. Possible values = 0 (default) & 1.
@@ -439,7 +439,7 @@ public function createTriggerCampaign($data)
439439
@options data {String} reply_to: The reply to email in the campaign emails [Optional]
440440
@options data {String} to_field: This is to personalize the «To» Field. If you want to include the
441441
first name and last name of your recipient, add [PRENOM] [NOM]. To use the contact attributes here
442-
, these should already exist in SendinBlue account [Optional]
442+
, these should already exist in Sendinblue account [Optional]
443443
@options data {Array} exclude_list: These are the lists which must be excluded from the campaign
444444
[Optional]
445445
@options data {Integer} recurring: Type of trigger campaign. Possible values = 0 (default) & 1.
@@ -594,11 +594,11 @@ public function displayListUsers($data)
594594
}
595595

596596
/*
597-
Add already existing users in the SendinBlue contacts to the list.
597+
Add already existing users in the Sendinblue contacts to the list.
598598
@param {Array} data contains php array with key value pair.
599599
@options data {Integer} id: Id of list to link users in it [Mandatory]
600600
@options data {Array} users: Email address of the already existing user(s) in the
601-
SendinBlue contacts. Example: "test@example.net". You can use commas to separate multiple
601+
Sendinblue contacts. Example: "test@example.net". You can use commas to separate multiple
602602
users [Mandatory]
603603
*/
604604

@@ -610,11 +610,11 @@ public function addUsersList($data)
610610
}
611611

612612
/*
613-
Delete already existing users in the SendinBlue contacts from the list.
613+
Delete already existing users in the Sendinblue contacts from the list.
614614
@param {Array} data contains php array with key value pair.
615615
@options data {Integer} id: Id of list to unlink users from it [Mandatory]
616616
@options data {Array} users: Email address of the already existing user(s) in the
617-
SendinBlue contacts to be modified. Example: "test@example.net". You can use commas
617+
Sendinblue contacts to be modified. Example: "test@example.net". You can use commas
618618
to separate multiple users [Mandatory]
619619
*/
620620
public function deleteUsersList($data)
@@ -650,7 +650,7 @@ public function getAttribute($data)
650650
@options data {String} type: Type of attribute. Possible values – normal, transactional,
651651
category, calculated & global ( case sensitive ) [Mandatory]
652652
@options data {Array} data: The name and data type of ‘normal’ & ‘transactional’ attribute
653-
to be created in your SendinBlue account. It should be sent as an associative array. Example:
653+
to be created in your Sendinblue account. It should be sent as an associative array. Example:
654654
array(‘ATTRIBUTE_NAME1′ => ‘DATA_TYPE1′, ‘ATTRIBUTE_NAME2’=> ‘DATA_TYPE2′).
655655
The name and data value of ‘category’, ‘calculated’ & ‘global’, should be sent as JSON string.
656656
Example: ‘[{ "name":"ATTRIBUTE_NAME1", "value":"Attribute_value1" }, { "name":"ATTRIBUTE_NAME2",
@@ -675,11 +675,11 @@ public function deleteAttribute($type, $data)
675675

676676
/*
677677
Create a new user if an email provided as input, doesn’t exists in the contact list
678-
of your SendinBlue account, otherwise it will update the existing user.
678+
of your Sendinblue account, otherwise it will update the existing user.
679679
@param {Array} data contains php array with key value pair.
680-
@options data {String} email: Email address of the user to be created in SendinBlue contacts.
681-
Already existing email address of user in the SendinBlue contacts to be modified [Mandatory]
682-
@options data {Array} attributes: The name of attribute present in your SendinBlue account.
680+
@options data {String} email: Email address of the user to be created in Sendinblue contacts.
681+
Already existing email address of user in the Sendinblue contacts to be modified [Mandatory]
682+
@options data {Array} attributes: The name of attribute present in your Sendinblue account.
683683
It should be sent as an associative array. Example: array("NAME"=>"name"). You can use commas
684684
to separate multiple attributes [Optional]
685685
@options data {Integer} blacklisted: This is used to blacklist/ Unblacklist a user. Possible
@@ -698,7 +698,7 @@ public function createUpdateUser($data)
698698
/*
699699
Get Access a specific user Information.
700700
@param {Array} data contains php array with key value pair.
701-
@options data {String} email: Email address of the already existing user in the SendinBlue
701+
@options data {String} email: Email address of the already existing user in the Sendinblue
702702
contacts [Mandatory]
703703
*/
704704
public function getUser($data)
@@ -709,7 +709,7 @@ public function getUser($data)
709709
/*
710710
Unlink existing user from all lists.
711711
@param {Array} data contains php array with key value pair.
712-
@options data {String} email: Email address of the already existing user in the SendinBlue
712+
@options data {String} email: Email address of the already existing user in the Sendinblue
713713
contacts to be unlinked from all lists [Mandatory]
714714
*/
715715
public function deleteUser($data)
@@ -743,7 +743,7 @@ public function importUsers($data)
743743
/*
744744
Export Users Information.
745745
@param {Array} data contains php array with key value pair.
746-
@options data {String} export_attrib: The name of attribute present in your SendinBlue account.
746+
@options data {String} export_attrib: The name of attribute present in your Sendinblue account.
747747
You can use commas to separate multiple attributes. Example: "EMAIL,NAME,SMS" [Optional]
748748
@options data {String} filter: Filter can be added to export users. Example: "{\"blacklisted\":1}",
749749
will export all blacklisted users [Mandatory]
@@ -934,7 +934,7 @@ public function sendEmail($data)
934934
}
935935

936936
/*
937-
Aggregate / date-wise report of the SendinBlue SMTP account.
937+
Aggregate / date-wise report of the Sendinblue SMTP account.
938938
@param {Array} data contains php array with key value pair.
939939
@options data {Integer} aggregate: This is used to indicate, you are interested in all-time totals.
940940
Possible values – 0 & 1. aggregate = 0 means it will not aggregate records, and will show stats per
@@ -990,15 +990,15 @@ public function deleteBounces($data)
990990
}
991991

992992
/*
993-
Send templates created on SendinBlue, through SendinBlue SMTP (transactional mails).
993+
Send templates created on Sendinblue, through Sendinblue SMTP (transactional mails).
994994
@param {Array} data contains php array with key value pair.
995-
@options data {Integer} id: Id of the template created on SendinBlue account [Mandatory]
995+
@options data {Integer} id: Id of the template created on Sendinblue account [Mandatory]
996996
@options data {String} to: Email address of the recipient(s). You can use pipe ( | )
997997
to separate multiple recipients. Example: "to-example@example.net|to2-example@example.net"
998998
[Mandatory]
999999
@options data {String} cc: Same as to but for Cc [Optional]
10001000
@options data {String} bcc: Same as to but for Bcc [Optional]
1001-
@options data {Array} attrv The name of attribute present in your SendinBlue account. It should
1001+
@options data {Array} attrv The name of attribute present in your Sendinblue account. It should
10021002
be sent as an associative array. Example: array("NAME"=>"name"). You can use commas to separate
10031003
multiple attributes [Optional]
10041004
@options data {String} attachment_url: Provide the absolute url of the attachment. Url not allowed
@@ -1030,7 +1030,7 @@ public function sendTransactionalTemplate($data)
10301030
@options data {String} reply_to: The reply to email in the campaign emails [Optional]
10311031
@options data {String} to_fieldv This is to personalize the «To» Field. If you want to include
10321032
the first name and last name of your recipient, add [PRENOM] [NOM]. To use the contact attributes
1033-
here, these should already exist in SendinBlue account [Optional]
1033+
here, these should already exist in Sendinblue account [Optional]
10341034
@options data {Integer} status: Status of template. Possible values = 0 (default) & 1. status = 0
10351035
means template is inactive, & status = 1 means template is active [Optional]
10361036
@options data {Integer} attachment: Status of attachment. Possible values = 0 (default) & 1.
@@ -1060,7 +1060,7 @@ public function createTemplate($data)
10601060
@options data {String} reply_to: The reply to email in the campaign emails [Optional]
10611061
@options data {String} to_field: This is to personalize the «To» Field. If you want to include the
10621062
first name and last name of your recipient, add [PRENOM] [NOM]. To use the contact attributes here,
1063-
these should already exist in SendinBlue account [Optional]
1063+
these should already exist in Sendinblue account [Optional]
10641064
@options data {Integer} status: Status of template. Possible values = 0 (default) & 1. status = 0
10651065
means template is inactive, & status = 1 means template is active [Optional]
10661066
@options data {Integer} attachment: Status of attachment. Possible values = 0 (default) & 1.
@@ -1103,7 +1103,7 @@ public function sendSms($data)
11031103
@options data {String} content: Content of the message. The maximum characters used per SMS is 160,
11041104
if used more than that, it will be counted as more than one SMS [Optional]
11051105
@options data {String} bat: Mobile number with the country code to send test SMS. The mobile number
1106-
defined here should belong to one of your contacts in SendinBlue account and should not be blacklisted
1106+
defined here should belong to one of your contacts in Sendinblue account and should not be blacklisted
11071107
[Optional]
11081108
@options data {Array} listid: These are the list ids to which the SMS campaign is sent [Mandatory: if
11091109
scheduled_date is not empty]
@@ -1129,7 +1129,7 @@ public function createSmsCampaign($data)
11291129
@options data {String} content: Content of the message. The maximum characters used per SMS is 160,
11301130
if used more than that, it will be counted as more than one SMS [Optional]
11311131
@options data {String} bat: Mobile number with the country code to send test SMS. The mobile number
1132-
defined here should belong to one of your contacts in SendinBlue account and should not be blacklisted
1132+
defined here should belong to one of your contacts in Sendinblue account and should not be blacklisted
11331133
[Optional]
11341134
@options data {Array} listid: hese are the list ids to which the SMS campaign is sent [Mandatory: if
11351135
scheduled_date is not empty]
@@ -1152,7 +1152,7 @@ public function updateSmsCampaign($data)
11521152
@param {Array} data contains php array with key value pair.
11531153
@options data {Integer} id: Id of the SMS campaign [Mandatory]
11541154
@options data {String} to: Mobile number with the country code to send test SMS. The mobile
1155-
number defined here should belong to one of your contacts in SendinBlue account and should not be
1155+
number defined here should belong to one of your contacts in Sendinblue account and should not be
11561156
blacklisted [Mandatory]
11571157
*/
11581158
public function sendBatSms($data)

0 commit comments

Comments
 (0)