Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0a2ce30edd | ||
|
|
4484195ddb |
No files matched your search
@@ -7,9 +7,16 @@ class ProductAdmin(admin.ModelAdmin):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class CardAdmin(admin.ModelAdmin):
|
||||||
|
list_display = ("name", "user", "card_id", "active")
|
||||||
|
list_filter = ("active",)
|
||||||
|
search_fields = ("user__username", "name")
|
||||||
|
|
||||||
|
|
||||||
admin.site.register(Product, ProductAdmin)
|
admin.site.register(Product, ProductAdmin)
|
||||||
admin.site.register(InventoryTransaction)
|
admin.site.register(InventoryTransaction)
|
||||||
admin.site.register(Order)
|
admin.site.register(Order)
|
||||||
admin.site.register(OrderLine)
|
admin.site.register(OrderLine)
|
||||||
admin.site.register(Transaction)
|
admin.site.register(Transaction)
|
||||||
admin.site.register(UserProfile)
|
admin.site.register(UserProfile)
|
||||||
|
admin.site.register(Card, CardAdmin)
|
||||||
@@ -245,3 +245,16 @@ class UserProfile(models.Model):
|
|||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"{self.user}"
|
return f"{self.user}"
|
||||||
|
|
||||||
|
|
||||||
|
class Card(models.Model):
|
||||||
|
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="cards")
|
||||||
|
card_id = models.CharField(max_length=32)
|
||||||
|
name = models.CharField(max_length=64)
|
||||||
|
# pin = models.IntegerField(max_length=4, blank=True, null=True)
|
||||||
|
# valid_until = models.DateTimeField(blank=True, null=True)
|
||||||
|
active = models.BooleanField(default=True)
|
||||||
|
created = models.DateTimeField(auto_now_add=True)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return f"{self.name}"
|
||||||
@@ -15,8 +15,8 @@ const Register = (): JSX.Element => {
|
|||||||
loading,
|
loading,
|
||||||
showAll,
|
showAll,
|
||||||
setShowAll,
|
setShowAll,
|
||||||
|
setSelectedUser,
|
||||||
selectedUser,
|
selectedUser,
|
||||||
toggleSelectedUser,
|
|
||||||
addToOrder,
|
addToOrder,
|
||||||
order,
|
order,
|
||||||
total,
|
total,
|
||||||
@@ -36,14 +36,14 @@ const Register = (): JSX.Element => {
|
|||||||
<UserCard
|
<UserCard
|
||||||
key={USER_EXTERNAL}
|
key={USER_EXTERNAL}
|
||||||
user={null}
|
user={null}
|
||||||
onUser={() => toggleSelectedUser(USER_EXTERNAL)}
|
onUser={() => setSelectedUser(USER_EXTERNAL)}
|
||||||
active={selectedUser == USER_EXTERNAL}
|
active={selectedUser == USER_EXTERNAL}
|
||||||
/>
|
/>
|
||||||
{users.map((user) => (
|
{users.map((user) => (
|
||||||
<UserCard
|
<UserCard
|
||||||
key={user.id}
|
key={user.id}
|
||||||
user={user}
|
user={user}
|
||||||
onUser={() => toggleSelectedUser(user.id)}
|
onUser={() => setSelectedUser(user.id)}
|
||||||
active={selectedUser == user.id}
|
active={selectedUser == user.id}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -38,10 +38,6 @@ export const useRegister = () => {
|
|||||||
setSelectedUser("");
|
setSelectedUser("");
|
||||||
};
|
};
|
||||||
|
|
||||||
const toggleSelectedUser = (userId: string) => {
|
|
||||||
setSelectedUser(selectedUser == userId ? "" : userId);
|
|
||||||
};
|
|
||||||
|
|
||||||
const addToOrder = (productId: string) => {
|
const addToOrder = (productId: string) => {
|
||||||
let added = false;
|
let added = false;
|
||||||
const newOrder = order.map((orderLine: OrderLineInput) => {
|
const newOrder = order.map((orderLine: OrderLineInput) => {
|
||||||
@@ -98,7 +94,6 @@ export const useRegister = () => {
|
|||||||
setShowAll,
|
setShowAll,
|
||||||
setSelectedUser,
|
setSelectedUser,
|
||||||
selectedUser,
|
selectedUser,
|
||||||
toggleSelectedUser,
|
|
||||||
addToOrder,
|
addToOrder,
|
||||||
order,
|
order,
|
||||||
total,
|
total,
|
||||||
|
|||||||
Reference in new issue
Block a user