Minor fix

Signed-off-by: Sam Poyigi <[email protected]>

src/Models/Banner.php

@@ -23,7 +23,7 @@ class Banner extends Model
      */
     protected $primaryKey = 'banner_id';
 
-    protected $fillable = ['name', 'type', 'click_url', 'language_id', 'alt_text', 'image_code', 'custom_code', 'status'];
+    protected $fillable = ['name', 'code', 'type', 'click_url', 'language_id', 'alt_text', 'image_code', 'custom_code', 'status'];
 
     public $relation = [
         'belongsTo' => [

src/Models/MailchimpSettings.php

@@ -14,6 +14,6 @@ class MailchimpSettings extends Model
 
     public static function isConfigured()
     {
-        return strlen(self::get('api_key', '')) && strlen(self::get('list_id', ''));
+        return !empty(self::get('api_key', ''));
     }
 }

src/Models/Subscriber.php

@@ -33,10 +33,10 @@ public static function subscribe(string $email, ?string $listId = null): static
     public function subscribeToMailchimp(?string $listId = null, array $options = [])
     {
         throw_unless(MailchimpSettings::isConfigured(), new ApplicationException(
-            'MailChimp List ID is missing. Enter your mailchimp api key and list ID from the admin settings page'
+            'MailChimp List ID is missing. Enter your mailchimp api key and list ID from the admin settings page',
         ));
 
-        $listId = (string)MailchimpSettings::get('list_id');
+        $listId = $listId ?? (string)MailchimpSettings::get('list_id');
 
         $response = resolve(MailChimp::class)->post("lists/$listId/members", array_merge([
             'email_address' => $this->email,

tests/Models/BannerTest.php

@@ -75,7 +75,7 @@
         ->toContain(Switchable::class)
         ->and($banner->getTable())->toBe('igniter_frontend_banners')
         ->and($banner->getKeyName())->toBe('banner_id')
-        ->and($banner->getFillable())->toContain('name', 'type', 'click_url', 'language_id', 'alt_text', 'image_code', 'custom_code', 'status')
+        ->and($banner->getFillable())->toContain('name', 'code', 'type', 'click_url', 'language_id', 'alt_text', 'image_code', 'custom_code', 'status')
         ->and($banner->relation['belongsTo'])->toBe([
             'language' => \Igniter\System\Models\Language::class,
         ])

tests/Models/MailchimpSettingsTest.php

@@ -27,28 +27,6 @@
     expect($result)->toBeFalse();
 });
 
-it('returns false when list_id is not configured', function() {
-    MailchimpSettings::set([
-        'api_key' => 'some-api-key',
-        'list_id' => '',
-    ]);
-
-    $result = MailchimpSettings::isConfigured();
-
-    expect($result)->toBeFalse();
-});
-
-it('returns false when both api_key and list_id are not configured', function() {
-    MailchimpSettings::set([
-        'api_key' => '',
-        'list_id' => '',
-    ]);
-
-    $result = MailchimpSettings::isConfigured();
-
-    expect($result)->toBeFalse();
-});
-
 it('configures captcha settings model correctly', function() {
     $model = new MailchimpSettings;