fix: merge conflict clean up

Author: julian-CStack

lib/db/drift/shared_db/shared_database.g.dart

@@ -12,6 +12,7 @@ class ShopInBitTickets extends Table {
 
   IntColumn get category => intEnum<ShopInBitCategory>()();
   IntColumn get status => intEnum<ShopInBitOrderStatus>()();
+  TextColumn get statusRaw => text().nullable()();
 
   TextColumn get requestDescription => text()();
   TextColumn get deliveryCountry => text()();

lib/db/drift/shared_db/tables/shopin_bit_tickets.dart

@@ -324,7 +324,6 @@ class ShopInBitOrderModel extends ChangeNotifier {
         )
         .toList();
 
-  static ShopInBitOrderModel fromIsarTicket(ShopInBitTicket ticket) {
     return ShopInBitOrderModel()
       .._displayName = ticket.displayName
       .._category = ticket.category

lib/models/shopinbit/shopinbit_order_model.dart

@@ -82,7 +82,8 @@ class ShopInBitOrdersService extends ChangeNotifier {
         final newStatus = ShopInBitOrderModel.statusFromTicketState(
           statusResp.value!.state,
         );
-        if (model.status != newStatus) {
+        model.statusRaw = statusResp.value!.stateRaw;
+        if (model.status != newStatus && newStatus != null) {
           model.status = newStatus;
           changed = true;
         }