Merge branch 'master' of github.com:mervekaraman/akaunting

resources/assets/js/components/NotificationPlugin/Notification.vue

@@ -220,6 +220,8 @@
 
                 let styles = {};
 
+                styles.zIndex = 100;
+
                 if (this.verticalAlign === 'top') {
                     styles.top = `${pixels}px`;
                 } else {

resources/lang/en-GB/general.php

@@ -231,6 +231,7 @@ return [
     'validation_error'      => 'Validation error',
     'dismiss'               => 'Dismiss',
     'size'                  => 'Size',
+    'media'                 => 'Media',
 
     'card' => [
         'cards'                 => 'Card|Cards',

resources/views/components/documents/form/line-item.blade.php

@@ -231,7 +231,7 @@
                                                 :class="[{'btn-outline-primary' : row.discount_type !== 'fixed'}, {'bg-white rounded-lg' : row.discount_type === 'fixed'}]"
                                                 @click="onChangeLineDiscountType(index, 'fixed')"
                                             >
-                                                <span class="text-base">{{ $currency->symbol }}</span>
+                                                <span class="text-base">{{ ($currency) ? $currency->symbol : '$' }}</span>
                                             </button>
                                         </div>