diff options
| -rw-r--r-- | icclient/member.h | 1 | ||||
| -rw-r--r-- | icclient/ord.h | 24 | ||||
| -rw-r--r-- | member.c | 1 | ||||
| -rw-r--r-- | ord.c | 96 |
4 files changed, 50 insertions, 72 deletions
diff --git a/icclient/member.h b/icclient/member.h index 3f90e93..6b9d2ee 100644 --- a/icclient/member.h +++ b/icclient/member.h @@ -1,6 +1,7 @@ #ifndef ICCLIENT_MEMBER_H #define ICCLIENT_MEMBER_H +#include <stdbool.h> #include "typedefs.h" struct icclient_member_preferences { diff --git a/icclient/ord.h b/icclient/ord.h index a1dd4ea..eccc822 100644 --- a/icclient/ord.h +++ b/icclient/ord.h @@ -19,21 +19,19 @@ struct icclient_ord_order { extern "C" { #endif - void icclient_ord_init(struct icclient_ord_order *order); - /*! - * \brief For putting an item to a cart. - * \param sku The SKU of the item to order. - * \param catalog A pointer to the catalog from which the item is. - * \param orderptr A pointer to pointer to the order. - */ - void icclient_ord_order(const char *sku, const struct icclient_catalog *catalog, - struct icclient_ord_order **orderptr); - void icclient_ord_checkout(struct icclient_ord_order *order, - struct icclient_member *member); - void icclient_ord_free(struct icclient_ord_order *order); +/*! + * \brief For putting an item to a cart. + * \param sku The SKU of the item to order. + * \param catalog The catalog from which the item is. + * \param order The address of an order instance. + */ +void icclient_ord_order(const char *sku, const struct icclient_catalog *catalog, + struct icclient_ord_order **order); +void icclient_ord_checkout(const struct icclient_ord_order *order, const struct icclient_member *member); +void icclient_ord_free(struct icclient_ord_order *order); #ifdef __cplusplus } #endif -#endif // ICCLIENT_ORD_H +#endif @@ -1,5 +1,4 @@ #include <stdlib.h> -#include <stdbool.h> #include "login.h" #include "icclient/member.h" @@ -1,33 +1,24 @@ #include <stdlib.h> #include <string.h> -#include <stdbool.h> #include "request.h" #include "icclient.h" #include "icclient/member.h" #include "icclient/ord.h" -void icclient_ord_init(struct icclient_ord_order *order) -{ - order->subtotal = .0; - order->shipping = .0; - order->subtotal = .0; - order->nitems = 0; -} - static int prodcmp(const void *product1, const void *product2) { - return strcmp((*(struct icclient_product * const *)product1)->sku - , (*(struct icclient_product * const *)product2)->sku); + return strcmp((*(struct icclient_product * const *)product1)->sku, + (*(struct icclient_product * const *)product2)->sku); } static int itemcmp(const void *item1, const void *item2) { - return strcmp((*(struct icclient_ord_item * const *)item1)->product->sku - , (*(struct icclient_ord_item * const *)item2)->product->sku); + return strcmp((*(struct icclient_ord_item * const *)item1)->product->sku, + (*(struct icclient_ord_item * const *)item2)->product->sku); } void icclient_ord_order(const char *sku, const struct icclient_catalog *catalog, - struct icclient_ord_order **orderptr) + struct icclient_ord_order **order) { struct icclient_product **products = ((struct icclient_catalog *)catalog)->products; qsort(products, catalog->length, sizeof(struct icclient_product *), prodcmp); @@ -35,70 +26,59 @@ void icclient_ord_order(const char *sku, const struct icclient_catalog *catalog, memset(key_product, '\0', sizeof(struct icclient_product)); key_product->sku = malloc(strlen(sku) + 1); strcpy(key_product->sku, sku); - struct icclient_product *product = *(struct icclient_product **)bsearch(&key_product - , products, catalog->length, sizeof(struct icclient_product *) - , prodcmp); + struct icclient_product *product = *(struct icclient_product **)bsearch(&key_product, products, + catalog->length, sizeof(struct icclient_product *), prodcmp); icclient_free_product(key_product); - - struct icclient_ord_order *order = *orderptr; struct icclient_ord_item *item = NULL; - - if (order) { - struct icclient_ord_item **items = order->items; - qsort(items, order->nitems, sizeof(struct icclient_ord_item *), itemcmp); + if (*order) { + struct icclient_ord_item **items = (*order)->items; + qsort(items, (*order)->nitems, sizeof(struct icclient_ord_item *), itemcmp); struct icclient_ord_item *key_item = malloc(sizeof(struct icclient_ord_item)); key_item->product = product; - struct icclient_ord_item **itemptr = bsearch(&key_item, items - , order->nitems, sizeof(struct icclient_ord_item *) - , itemcmp); + struct icclient_ord_item **itemptr = bsearch(&key_item, items, (*order)->nitems, + sizeof(struct icclient_ord_item *), itemcmp); if (itemptr) item = *itemptr; free(key_item); } else { - *orderptr = malloc(sizeof(struct icclient_ord_order)); - order = *orderptr; - icclient_ord_init(order); + *order = malloc(sizeof(struct icclient_ord_order)); + memset(*order, '\0', sizeof(struct icclient_ord_order)); } - if (item) item->quantity++; else { - size_t i = order->nitems; - *orderptr = realloc(order, sizeof(struct icclient_ord_order) - + (i + 1) * sizeof(struct icclient_ord_item)); - order = *orderptr; - order->items[i] = malloc(sizeof(struct icclient_ord_item)); - order->nitems++; - item = order->items[i]; + size_t i = (*order)->nitems; + *order = realloc(*order, sizeof(struct icclient_ord_order) + (i + 1) + * sizeof(struct icclient_ord_item)); + (*order)->items[i] = malloc(sizeof(struct icclient_ord_item)); + (*order)->nitems++; + item = (*order)->items[i]; item->product = product; item->quantity = 1; } - - order->subtotal += item->product->price; - order->total_cost += item->product->price; - + (*order)->subtotal += item->product->price; + (*order)->total_cost += item->product->price; request(NULL, NULL, NULL, "%s%s", "order?mv_arg=", sku); } -void icclient_ord_checkout(struct icclient_ord_order *order, - struct icclient_member *member) +void icclient_ord_checkout(const struct icclient_ord_order *order, const struct icclient_member *member) { request(NULL, NULL, &(struct body){ 14, { - { "mv_todo", "submit" }, - { "mv_action", "refresh" }, - { "mv_order_profile", order->profile }, - { "fname", member->fname }, - { "lname", member->lname }, - { "address1", member->address1 }, - { "address2", member->address2 }, - { "city", member->city }, - { "state", member->state }, - { "zip", member->zip }, - { "email", member->email }, - { "phone_day", member->phone_day }, - { "mv_same_billing", member->preferences->mv_same_billing? "1" : "0" }, - { "email_copy", member->preferences->email_copy? "1" : "0" } - }}, "%s", "ord/checkout"); + { "mv_todo", "submit" }, + { "mv_action", "refresh" }, + { "mv_order_profile", order->profile }, + { "fname", member->fname }, + { "lname", member->lname }, + { "address1", member->address1 }, + { "address2", member->address2 }, + { "city", member->city }, + { "state", member->state }, + { "zip", member->zip }, + { "email", member->email }, + { "phone_day", member->phone_day }, + { "mv_same_billing", member->preferences->mv_same_billing? "1" : "0" }, + { "email_copy", member->preferences->email_copy? "1" : "0" } + }}, "%s", "ord/checkout"); } void icclient_ord_free(struct icclient_ord_order *order) |